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

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/auth

Files:

• pampass.c (modified) (3 diffs)
• token_util.c (modified) (2 diffs)

branches/samba-3.2.x/source/auth/pampass.c

@@ -64 +64 @@
  */
 #define COPY_STRING(s) (s) ? SMB_STRDUP(s) : NULL
+#define COPY_FSTRING(s) (s[0]) ? SMB_STRDUP(s) : NULL
 
 /*******************************************************************
@@ -328 +329 @@
 #endif
                                         reply[replies].resp_retcode = PAM_SUCCESS;
-                                        reply[replies].resp = COPY_STRING(current_reply);
+                                        reply[replies].resp = COPY_FSTRING(current_reply);
                                         found = True;
                                         break;
@@ -356 +357 @@
                                         pwd_sub(current_reply, udp->PAM_username, udp->PAM_password, udp->PAM_newpassword);
                                         reply[replies].resp_retcode = PAM_SUCCESS;
-                                        reply[replies].resp = COPY_STRING(current_reply);
+                                        reply[replies].resp = COPY_FSTRING(current_reply);
 #ifdef DEBUG_PASSWORD
                                         DEBUG(100,("smb_pam_passchange_conv: PAM_PROMPT_ECHO_OFF: We actualy sent: %s\n", current_reply));

branches/samba-3.2.x/source/auth/token_util.c

@@ -78 +78 @@
 NT_USER_TOKEN *get_root_nt_token( void )
 {
-        struct nt_user_token *token = NULL;
+        struct nt_user_token *token, *for_cache;
         DOM_SID u_sid, g_sid;
         struct passwd *pw;
@@ -108 +108 @@
         token->privileges = se_disk_operators;
 
+        for_cache = token;
+
         memcache_add_talloc(
                 NULL, SINGLETON_CACHE_TALLOC,
-                data_blob_string_const("root_nt_token"), token);
+                data_blob_string_const("root_nt_token"), &for_cache);
 
         return token;