Changeset 740 for vendor/current/nsswitch/libwbclient/wbclient.h

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/nsswitch/libwbclient/wbclient.h (modified) (14 diffs)

vendor/current/nsswitch/libwbclient/wbclient.h

@@ -66 +66 @@
  *  0.4: Added wbcSidTypeString()
  *  0.5: Added wbcChangeTrustCredentials()
+ *  0.6: Made struct wbcInterfaceDetails char* members non-const
+ *  0.7: Added wbcSidToStringBuf()
+ *  0.8: Added wbcSidsToUnixIds() and wbcLookupSids()
  **/
 #define WBCLIENT_MAJOR_VERSION 0
-#define WBCLIENT_MINOR_VERSION 5
+#define WBCLIENT_MINOR_VERSION 8
 #define WBCLIENT_VENDOR_VERSION "Samba libwbclient"
 struct wbcLibraryDetails {
@@ -82 +85 @@
 struct wbcInterfaceDetails {
         uint32_t interface_version;
-        const char *winbind_version;
+        char *winbind_version;
         char winbind_separator;
-        const char *netbios_name;
-        const char *netbios_domain;
-        const char *dns_domain;
+        char *netbios_name;
+        char *netbios_domain;
+        char *dns_domain;
 };
 
@@ -191 +194 @@
 #define WBC_DOMINFO_TRUSTTYPE_IN_FOREST  0x00000002
 #define WBC_DOMINFO_TRUSTTYPE_EXTERNAL   0x00000003
-
 
 /**
@@ -430 +432 @@
 
 enum wbcPasswordChangeRejectReason {
-        WBC_PWD_CHANGE_REJECT_OTHER=0,
-        WBC_PWD_CHANGE_REJECT_TOO_SHORT=1,
-        WBC_PWD_CHANGE_REJECT_IN_HISTORY=2,
-        WBC_PWD_CHANGE_REJECT_COMPLEXITY=5
-};
+        WBC_PWD_CHANGE_NO_ERROR=0,
+        WBC_PWD_CHANGE_PASSWORD_TOO_SHORT=1,
+        WBC_PWD_CHANGE_PWD_IN_HISTORY=2,
+        WBC_PWD_CHANGE_USERNAME_IN_PASSWORD=3,
+        WBC_PWD_CHANGE_FULLNAME_IN_PASSWORD=4,
+        WBC_PWD_CHANGE_NOT_COMPLEX=5,
+        WBC_PWD_CHANGE_MACHINE_NOT_DEFAULT=6,
+        WBC_PWD_CHANGE_FAILED_BY_FILTER=7,
+        WBC_PWD_CHANGE_PASSWORD_TOO_LONG=8
+};
+
+/* Note: this defines exist for compatibility reasons with existing code */
+#define WBC_PWD_CHANGE_REJECT_OTHER      WBC_PWD_CHANGE_NO_ERROR
+#define WBC_PWD_CHANGE_REJECT_TOO_SHORT  WBC_PWD_CHANGE_PASSWORD_TOO_SHORT
+#define WBC_PWD_CHANGE_REJECT_IN_HISTORY WBC_PWD_CHANGE_PWD_IN_HISTORY
+#define WBC_PWD_CHANGE_REJECT_COMPLEXITY WBC_PWD_CHANGE_NOT_COMPLEX
 
 /**
@@ -519 +532 @@
 const char* wbcSidTypeString(enum wbcSidType type);
 
+#define WBC_SID_STRING_BUFLEN (15*11+25)
+
+/*
+ * @brief Print a sid into a buffer
+ *
+ * @param sid           Binary Security Identifier
+ * @param buf           Target buffer
+ * @param buflen        Target buffer length
+ *
+ * @return Resulting string length.
+ */
+int wbcSidToStringBuf(const struct wbcDomainSid *sid, char *buf, int buflen);
+
 /**
  * @brief Convert a binary SID to a character string
@@ -611 +637 @@
                     char **name,
                     enum wbcSidType *name_type);
+
+struct wbcTranslatedName {
+        enum wbcSidType type;
+        char *name;
+        int domain_index;
+};
+
+wbcErr wbcLookupSids(const struct wbcDomainSid *sids, int num_sids,
+                     struct wbcDomainInfo **domains, int *num_domains,
+                     struct wbcTranslatedName **names);
 
 /**
@@ -758 +794 @@
                         struct wbcDomainSid *sid);
 
+enum wbcIdType {
+        WBC_ID_TYPE_NOT_SPECIFIED,
+        WBC_ID_TYPE_UID,
+        WBC_ID_TYPE_GID
+};
+
+union wbcUnixIdContainer {
+        uid_t uid;
+        gid_t gid;
+};
+
+struct wbcUnixId {
+        enum wbcIdType type;
+        union wbcUnixIdContainer id;
+};
+
+/**
+ * @brief Convert a list of sids to unix ids
+ *
+ * @param sids        Pointer to an array of SIDs to convert
+ * @param num_sids    Number of SIDs
+ * @param ids         Preallocated output array for translated IDs
+ *
+ * @return #wbcErr
+ *
+ **/
+wbcErr wbcSidsToUnixIds(const struct wbcDomainSid *sids, uint32_t num_sids,
+                        struct wbcUnixId *ids);
+
 /**
  * @brief Obtain a new uid from Winbind
@@ -783 +848 @@
  *
  * @return #wbcErr
+ *
+ * @deprecated      This method is not impemented any more and should
+ *                  be removed in the next major version change.
  **/
 wbcErr wbcSetUidMapping(uid_t uid, const struct wbcDomainSid *sid);
@@ -793 +861 @@
  *
  * @return #wbcErr
+ *
+ * @deprecated      This method is not impemented any more and should
+ *                  be removed in the next major version change.
  **/
 wbcErr wbcSetGidMapping(gid_t gid, const struct wbcDomainSid *sid);
@@ -803 +874 @@
  *
  * @return #wbcErr
+ *
+ * @deprecated      This method is not impemented any more and should
+ *                  be removed in the next major version change.
  **/
 wbcErr wbcRemoveUidMapping(uid_t uid, const struct wbcDomainSid *sid);
@@ -813 +887 @@
  *
  * @return #wbcErr
+ *
+ * @deprecated      This method is not impemented any more and should
+ *                  be removed in the next major version change.
  **/
 wbcErr wbcRemoveGidMapping(gid_t gid, const struct wbcDomainSid *sid);
@@ -822 +899 @@
  *
  * @return #wbcErr
+ *
+ * @deprecated      This method is not impemented any more and should
+ *                  be removed in the next major version change.
  **/
 wbcErr wbcSetUidHwm(uid_t uid_hwm);
@@ -831 +911 @@
  *
  * @return #wbcErr
+ *
+ * @deprecated      This method is not impemented any more and should
+ *                  be removed in the next major version change.
  **/
 wbcErr wbcSetGidHwm(gid_t gid_hwm);
@@ -971 +1054 @@
  * @brief Lookup the current status of a trusted domain
  *
- * @param domain      Domain to query
- * @param *info       Pointer to returned domain_info struct
+ * @param domain        The domain to query
+ *
+ * @param dinfo          A pointer to store the returned domain_info struct.
  *
  * @return #wbcErr
  **/
 wbcErr wbcDomainInfo(const char *domain,
-                     struct wbcDomainInfo **info);
+                     struct wbcDomainInfo **dinfo);
+
+/**
+ * @brief Lookup the currently contacted DCs
+ *
+ * @param domain        The domain to query
+ *
+ * @param num_dcs       Number of DCs currently known
+ * @param dc_names      Names of the currently known DCs
+ * @param dc_ips        IP addresses of the currently known DCs
+ *
+ * @return #wbcErr
+ **/
+wbcErr wbcDcInfo(const char *domain, size_t *num_dcs,
+                 const char ***dc_names, const char ***dc_ips);
 
 /**