Changeset 599 for trunk/server/nsswitch

Timestamp:

Jul 6, 2011, 8:21:13 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.9

Location:

trunk/server/nsswitch

Files:

• libwbclient/wbc_pam.c (modified) (1 diff)
• winbind_krb5_locator.c (modified) (1 diff)
• winbind_nss_freebsd.c (modified) (1 diff)

trunk/server/nsswitch/libwbclient/wbc_pam.c

@@ -866 +866 @@
 
                 if (params->new_password.response.nt_data) {
+                        request.data.chng_pswd_auth_crap.new_nt_pswd_len =
+                                params->new_password.response.nt_length;
                         memcpy(request.data.chng_pswd_auth_crap.new_nt_pswd,
                                params->new_password.response.nt_data,
                                request.data.chng_pswd_auth_crap.new_nt_pswd_len);
-                        request.data.chng_pswd_auth_crap.new_nt_pswd_len =
-                                params->new_password.response.nt_length;
                 }
 
                 if (params->new_password.response.lm_data) {
+                        request.data.chng_pswd_auth_crap.new_lm_pswd_len =
+                                params->new_password.response.lm_length;
                         memcpy(request.data.chng_pswd_auth_crap.new_lm_pswd,
                                params->new_password.response.lm_data,
                                request.data.chng_pswd_auth_crap.new_lm_pswd_len);
-                        request.data.chng_pswd_auth_crap.new_lm_pswd_len =
-                                params->new_password.response.lm_length;
                 }
 
                 if (params->old_password.response.old_nt_hash_enc_data) {
+                        request.data.chng_pswd_auth_crap.old_nt_hash_enc_len =
+                                params->old_password.response.old_nt_hash_enc_length;
                         memcpy(request.data.chng_pswd_auth_crap.old_nt_hash_enc,
                                params->old_password.response.old_nt_hash_enc_data,
                                request.data.chng_pswd_auth_crap.old_nt_hash_enc_len);
-                        request.data.chng_pswd_auth_crap.old_nt_hash_enc_len =
-                                params->old_password.response.old_nt_hash_enc_length;
                 }
 
                 if (params->old_password.response.old_lm_hash_enc_data) {
+                        request.data.chng_pswd_auth_crap.old_lm_hash_enc_len =
+                                params->old_password.response.old_lm_hash_enc_length;
                         memcpy(request.data.chng_pswd_auth_crap.old_lm_hash_enc,
                                params->old_password.response.old_lm_hash_enc_data,
                                request.data.chng_pswd_auth_crap.old_lm_hash_enc_len);
-                        request.data.chng_pswd_auth_crap.old_lm_hash_enc_len =
-                                params->old_password.response.old_lm_hash_enc_length;
                 }
 

trunk/server/nsswitch/winbind_krb5_locator.c

@@ -193 +193 @@
                 }
 
-                if (ret == EAI_AGAIN) {
+                if ((ret == EAI_AGAIN) && (count > 1)) {
                         count--;
                         continue;

trunk/server/nsswitch/winbind_nss_freebsd.c

@@ -59 +59 @@
 { NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_winbind_getgrgid_r },
 { NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r },
-{ NSDB_GROUP, "endgrent",   __nss_compat_setgrent,   _nss_winbind_setgrent },
-{ NSDB_GROUP, "setgrent",   __nss_compat_endgrent,   _nss_winbind_endgrent },
+{ NSDB_GROUP, "setgrent",   __nss_compat_setgrent,   _nss_winbind_setgrent },
+{ NSDB_GROUP, "endgrent",   __nss_compat_endgrent,   _nss_winbind_endgrent },
 
 { NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r },
 { NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r },
 { NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_winbind_getpwent_r },
-{ NSDB_PASSWD, "endpwent",   __nss_compat_setpwent,   _nss_winbind_setpwent },
-{ NSDB_PASSWD, "setpwent",   __nss_compat_endpwent,   _nss_winbind_endpwent },
+{ NSDB_PASSWD, "setpwent",   __nss_compat_setpwent,   _nss_winbind_setpwent },
+{ NSDB_PASSWD, "endpwent",   __nss_compat_endpwent,   _nss_winbind_endpwent },
 
 };