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

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

Location:

branches/samba-3.2.x/source/nsswitch

Files:

• libwbclient/wbc_sid.c (modified) (4 diffs)
• pam_winbind.c (modified) (1 diff)
• winbind_struct_protocol.h (modified) (1 diff)
• wins.c (modified) (10 diffs)

branches/samba-3.2.x/source/nsswitch/libwbclient/wbc_sid.c

@@ -41 +41 @@
         int i;
         char *tmp = NULL;
-        TALLOC_CTX *ctx = NULL;
 
         if (!sid) {
@@ -47 +46 @@
                 BAIL_ON_WBC_ERROR(wbc_status);
         }
-
-        ctx = talloc_init("wbcSidToString");
-        BAIL_ON_PTR_ERROR(ctx, wbc_status);
 
         id_auth = sid->id_auth[5] +
@@ -56 +52 @@
                 (sid->id_auth[2] << 24);
 
-        tmp = talloc_asprintf(ctx, "S-%d-%d", sid->sid_rev_num, id_auth);
+        tmp = talloc_asprintf(NULL, "S-%d-%d", sid->sid_rev_num, id_auth);
         BAIL_ON_PTR_ERROR(tmp, wbc_status);
 
@@ -67 +63 @@
         }
 
-        *sid_string=talloc_strdup(NULL, tmp);
-        BAIL_ON_PTR_ERROR((*sid_string), wbc_status);
+        *sid_string = tmp;
+        tmp = NULL;
 
         wbc_status = WBC_ERR_SUCCESS;
 
 done:
-        talloc_free(ctx);
+        talloc_free(tmp);
 
         return wbc_status;

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

@@ -2359 +2359 @@
 
 out:
+        /*
+         * Delete the krb5 ccname variable from the PAM environment
+         * if it was set by winbind.
+         */
+        if (ctx->ctrl & WINBIND_KRB5_AUTH) {
+                pam_putenv(pamh, "KRB5CCNAME");
+        }
 
         _PAM_LOG_FUNCTION_LEAVE("pam_sm_close_session", ctx, retval);

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

@@ -203 +203 @@
 /* Flag to say this is a winbindd internal send - don't recurse. */
 #define WBFLAG_RECURSE                  0x00000800
-
+/* Flag to tell winbind the NTLMv2 blob is too big for the struct and is in the
+ * extra_data field */
+#define WBFLAG_BIG_NTLMV2_BLOB          0x00010000
 
 #define WINBINDD_MAX_EXTRA_DATA (128*1024)

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

@@ -24 +24 @@
 
 #include <ns_daemon.h>
+#endif
+
+#if HAVE_PTHREAD_H
+#include <pthread.h>
+#endif
+
+#if HAVE_PTHREAD
+static pthread_mutex_t wins_nss_mutex = PTHREAD_MUTEX_INITIALIZER;
 #endif
 
@@ -322 +330 @@
                           char *buffer, size_t buflen, int *h_errnop)
 {
+        NSS_STATUS nss_status = NSS_STATUS_SUCCESS;
         struct in_addr *ip_list;
         int i, count;
@@ -327 +336 @@
         size_t namelen;
                 
+#if HAVE_PTHREAD
+        pthread_mutex_lock(&wins_nss_mutex);
+#endif
+
         memset(he, '\0', sizeof(*he));
         fstrcpy(name, hostname);
@@ -334 +347 @@
         ip_list = lookup_byname_backend(name, &count);
 
-        if (!ip_list)
-                return NSS_STATUS_NOTFOUND;
+        if (!ip_list) {
+                nss_status = NSS_STATUS_NOTFOUND;
+                goto out;
+        }
 
         /* Copy h_name */
@@ -343 +358 @@
         if ((he->h_name = get_static(&buffer, &buflen, namelen)) == NULL) {
                 free(ip_list);
-                return NSS_STATUS_TRYAGAIN;
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
         }
 
@@ -355 +371 @@
         if (get_static(&buffer, &buflen, i) == NULL) {
                 free(ip_list);
-                return NSS_STATUS_TRYAGAIN;
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
         }
 
@@ -361 +378 @@
                      &buffer, &buflen, (count + 1) * sizeof(char *))) == NULL) {
                 free(ip_list);
-                return NSS_STATUS_TRYAGAIN;
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
         }
 
@@ -368 +386 @@
                                                      INADDRSZ)) == NULL) {
                         free(ip_list);
-                        return NSS_STATUS_TRYAGAIN;
+                        nss_status = NSS_STATUS_TRYAGAIN;
+                        goto out;
                 }
                 memcpy(he->h_addr_list[i], &ip_list[i], INADDRSZ);
@@ -387 +406 @@
                 i = sizeof(char*) - i;
 
-        if (get_static(&buffer, &buflen, i) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+        if (get_static(&buffer, &buflen, i) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         if ((he->h_aliases = (char **)get_static(
-                     &buffer, &buflen, sizeof(char *))) == NULL)
-                return NSS_STATUS_TRYAGAIN;
+                     &buffer, &buflen, sizeof(char *))) == NULL) {
+                nss_status = NSS_STATUS_TRYAGAIN;
+                goto out;
+        }
 
         he->h_aliases[0] = NULL;
 
-        return NSS_STATUS_SUCCESS;
+        nss_status = NSS_STATUS_SUCCESS;
+
+  out:
+
+#if HAVE_PTHREAD
+        pthread_mutex_unlock(&wins_nss_mutex);
+#endif
+        return nss_status;
 }
 
@@ -404 +434 @@
                            char *buffer, size_t buflen, int *h_errnop)
 {
+        NSS_STATUS nss_status;
+
         if(af!=AF_INET) {
                 *h_errnop = NO_DATA;
-                return NSS_STATUS_UNAVAIL;
-        }
-
-        return _nss_wins_gethostbyname_r(
-                name, he, buffer, buflen, h_errnop);
-}
-#endif
+                nss_status = NSS_STATUS_UNAVAIL;
+        } else {
+                nss_status = _nss_wins_gethostbyname_r(
+                                name, he, buffer, buflen, h_errnop);
+        }
+        return nss_status;
+}
+#endif