Changeset 740 for vendor/current/nsswitch/pam_winbind.c

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/pam_winbind.c (modified) (11 diffs)

vendor/current/nsswitch/pam_winbind.c

@@ -157 +157 @@
 {
         if (!initialized) {
-                bindtextdomain(MODULE_NAME, dyn_LOCALEDIR);
+                bindtextdomain(MODULE_NAME, LOCALEDIR);
                 initialized = 1;
         }
@@ -1078 +1078 @@
                                        int sid_list_buffer_size)
 {
-        const char* sid_string = NULL;
-        char *sid_str = NULL;
+        char sid_string[WBC_SID_STRING_BUFLEN];
 
         /* lookup name? */
         if (IS_SID_STRING(name)) {
-                sid_string = name;
+                strlcpy(sid_string, name, sizeof(sid_string));
         } else {
                 wbcErr wbc_status;
@@ -1099 +1098 @@
                 }
 
-                wbc_status = wbcSidToString(&sid, &sid_str);
-                if (!WBC_ERROR_IS_OK(wbc_status)) {
-                        return false;
-                }
-
-                sid_string = sid_str;
+                wbcSidToStringBuf(&sid, sid_string, sizeof(sid_string));
         }
 
         if (!safe_append_string(sid_list_buffer, sid_string,
                                 sid_list_buffer_size)) {
-                wbcFreeMemory(sid_str);
                 return false;
         }
-
-        wbcFreeMemory(sid_str);
         return true;
 }
@@ -1145 +1136 @@
 
         search_location = name_list;
-        while ((comma = strstr(search_location, ",")) != NULL) {
+        while ((comma = strchr(search_location, ',')) != NULL) {
                 current_name = strndup(search_location,
                                        comma - search_location);
@@ -1200 +1191 @@
                  */
                 len = strlen(sid_list_buffer);
-                if (len) {
-                        if (sid_list_buffer[len - 1] == ',') {
-                                sid_list_buffer[len - 1] = '\0';
-                        }
+                if ((len != 0) && (sid_list_buffer[len - 1] == ',')) {
+                        sid_list_buffer[len - 1] = '\0';
                 }
         }
@@ -1435 +1424 @@
                                        const struct wbcAuthErrorInfo *e,
                                        const char *nt_status_string,
-                                       int *pam_error)
+                                       int *pam_err)
 {
         const char *ntstatus = NULL;
         const char *error_string = NULL;
 
-        if (!e || !pam_error) {
+        if (!e || !pam_err) {
                 return false;
         }
@@ -1454 +1443 @@
                 if (error_string) {
                         _make_remark(ctx, PAM_ERROR_MSG, error_string);
-                        *pam_error = e->pam_error;
+                        *pam_err = e->pam_error;
                         return true;
                 }
 
                 if (e->display_string) {
-                        _make_remark(ctx, PAM_ERROR_MSG, e->display_string);
-                        *pam_error = e->pam_error;
+                        _make_remark(ctx, PAM_ERROR_MSG, _(e->display_string));
+                        *pam_err = e->pam_error;
                         return true;
                 }
 
                 _make_remark(ctx, PAM_ERROR_MSG, nt_status_string);
-                *pam_error = e->pam_error;
+                *pam_err = e->pam_error;
 
                 return true;
@@ -1902 +1891 @@
 
  done:
-        if (logon.blobs) {
-                wbcFreeMemory(logon.blobs);
-        }
+        wbcFreeMemory(logon.blobs);
         if (info && info->blobs && !p_info) {
                 wbcFreeMemory(info->blobs);
@@ -2001 +1988 @@
                         case -1:
                                 break;
-                        case WBC_PWD_CHANGE_REJECT_OTHER:
+                        case WBC_PWD_CHANGE_NO_ERROR:
                                 if ((min_pwd_age > 0) &&
                                     (pwd_last_set + min_pwd_age > time(NULL))) {
@@ -2008 +1995 @@
                                 }
                                 break;
-                        case WBC_PWD_CHANGE_REJECT_TOO_SHORT:
+                        case WBC_PWD_CHANGE_PASSWORD_TOO_SHORT:
                                 PAM_WB_REMARK_DIRECT(ctx,
                                         "NT_STATUS_PWD_TOO_SHORT");
                                 break;
-                        case WBC_PWD_CHANGE_REJECT_IN_HISTORY:
+                        case WBC_PWD_CHANGE_PWD_IN_HISTORY:
                                 PAM_WB_REMARK_DIRECT(ctx,
                                         "NT_STATUS_PWD_HISTORY_CONFLICT");
                                 break;
-                        case WBC_PWD_CHANGE_REJECT_COMPLEXITY:
+                        case WBC_PWD_CHANGE_NOT_COMPLEX:
                                 _make_remark(ctx, PAM_ERROR_MSG,
                                              _("Password does not meet "
@@ -2425 +2412 @@
         struct wbcDomainSid sid;
         enum wbcSidType type;
-        char *domain;
+        char *domain = NULL;
         char *name;
         char *p;