Changeset 232 for branches/samba-3.2.x/source/nsswitch

Timestamp:

May 27, 2009, 9:09:42 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.8

Location:

branches/samba-3.2.x/source/nsswitch

Files:

• pam_winbind.c (modified) (1 diff)
• pam_winbind.h (modified) (1 diff)
• winbind_nss_solaris.c (modified) (2 diffs)
• winbind_nss_solaris.h (modified) (1 diff)

branches/samba-3.2.x/source/nsswitch/pam_winbind.c

@@ -2363 +2363 @@
          * if it was set by winbind.
          */
-        if (ctx->ctrl & WINBIND_KRB5_AUTH) {
+        if ((ctx->ctrl & WINBIND_KRB5_AUTH) && pam_getenv(pamh, "KRB5CCNAME")) {
                 pam_putenv(pamh, "KRB5CCNAME");
         }

branches/samba-3.2.x/source/nsswitch/pam_winbind.h

@@ -21 +21 @@
 #include <iniparser.h>
 
-#ifndef LINUX
+#if defined(LINUX)
+
+/* newer versions of PAM have this in _pam_compat.h */
+#ifndef PAM_AUTHTOK_RECOVERY_ERR
+#define PAM_AUTHTOK_RECOVERY_ERR PAM_AUTHTOK_RECOVER_ERR
+#endif
+
+#else /* !LINUX */
 
 /* Solaris always uses dynamic pam modules */

branches/samba-3.2.x/source/nsswitch/winbind_nss_solaris.c

@@ -282 +282 @@
         int errnop;
         struct nss_groupsbymem *gmem = (struct nss_groupsbymem *)args;
+        long int numgids = gmem->numgids;
+        long int maxgids = gmem->maxgids;
 
         NSS_DEBUG("_nss_winbind_getgroupsbymember");
@@ -287 +289 @@
         _nss_winbind_initgroups_dyn(gmem->username,
                 gmem->gid_array[0], /* Primary Group */
-                &gmem->numgids,
-                &gmem->maxgids,
+                &numgids,
+                &maxgids,
                 &gmem->gid_array,
                 gmem->maxgids,
                 &errnop);
+
+        gmem->numgids = numgids;
+        gmem->maxgids = maxgids;
 
         /*

branches/samba-3.2.x/source/nsswitch/winbind_nss_solaris.h

@@ -82 +82 @@
                                    struct group *result, char *buffer,
                                    size_t buflen, int *errnop);
+NSS_STATUS _nss_winbind_initgroups_dyn(char *user, gid_t group, long int *start,
+                                       long int *size, gid_t **groups,
+                                       long int limit, int *errnop);
 
 #endif /* _WINBIND_NSS_SOLARIS_H */