Changeset 370 for branches/samba-3.3.x/source/winbindd

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

Location:

branches/samba-3.3.x/source/winbindd

Files:

• idmap_ldap.c (modified) (1 diff)
• winbindd_cred_cache.c (modified) (1 diff)
• winbindd_pam.c (modified) (3 diffs)
• winbindd_rpc.c (modified) (2 diffs)

branches/samba-3.3.x/source/winbindd/idmap_ldap.c

@@ -854 +854 @@
         CHECK_ALLOC_DONE(ctx->url);
 
+        trim_char(ctx->url, '\"', '\"');
+
         tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
         if ( ! tmp || ! *tmp) {

branches/samba-3.3.x/source/winbindd/winbindd_cred_cache.c

@@ -24 +24 @@
 #include "includes.h"
 #include "winbindd.h"
+#include "smb_krb5.h"
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND

branches/samba-3.3.x/source/winbindd/winbindd_pam.c

@@ -25 +25 @@
 #include "includes.h"
 #include "winbindd.h"
+#include "smb_krb5.h"
+
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
@@ -811 +813 @@
 {
         struct winbindd_domain *domain;
-        fstring name_domain, name_user;
-        char *mapped_user = NULL;
+        fstring name_domain, name_user, mapped_user;
+        char *mapped = NULL;
         NTSTATUS result;
         NTSTATUS name_map_status = NT_STATUS_UNSUCCESSFUL;
@@ -836 +838 @@
         name_map_status = normalize_name_unmap(state->mem_ctx,
                                                state->request.data.auth.user,
-                                               &mapped_user);
+                                               &mapped);
 
         /* If the name normalization didnt' actually do anything,
            just use the original name */
 
-        if (!NT_STATUS_IS_OK(name_map_status) &&
-            !NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED))
-        {
-                mapped_user = state->request.data.auth.user;
+        if (NT_STATUS_IS_OK(name_map_status)
+            ||NT_STATUS_EQUAL(name_map_status, NT_STATUS_FILE_RENAMED)) {
+                fstrcpy(mapped_user, mapped);
+        } else {
+                fstrcpy(mapped_user, state->request.data.auth.user);
         }
 

branches/samba-3.3.x/source/winbindd/winbindd_rpc.c

@@ -788 +788 @@
                 return result;
 
-        *num_names = rids->count;
-        rid_mem = rids->rids;
-
-        if (!*num_names) {
+        if (!rids || !rids->count) {
                 names = NULL;
                 name_types = NULL;
@@ -797 +794 @@
                 return NT_STATUS_OK;
         }
+
+        *num_names = rids->count;
+        rid_mem = rids->rids;
 
         /* Step #2: Convert list of rids into list of usernames.  Do this