Changeset 745 for trunk/server/source3/passdb/pdb_smbpasswd.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/passdb/pdb_smbpasswd.c (modified) (33 diffs)

trunk/server/source3/passdb/pdb_smbpasswd.c

@@ -22 +22 @@
 
 #include "includes.h"
+#include "passdb.h"
+#include "system/passwd.h"
+#include "system/filesys.h"
+#include "../librpc/gen_ndr/samr.h"
+#include "../libcli/security/security.h"
 
 #undef DBGC_CLASS
@@ -31 +36 @@
    stored by an smbpasswd entry 
  */
- 
+
 struct smb_passwd
 {
@@ -40 +45 @@
         const unsigned char *smb_nt_passwd; /* Null if no password */
 
-        uint16 acct_ctrl;             /* account info (ACB_xxxx bit-mask) */
+        uint16_t acct_ctrl;             /* account info (ACB_xxxx bit-mask) */
         time_t pass_last_set_time;    /* password last set time */
 };
@@ -48 +53 @@
         /* used for maintain locks on the smbpasswd file */
         int     pw_file_lock_depth;
-        
+
         /* Global File pointer */
         FILE    *pw_file;
-        
+
         /* formerly static variables */
         struct smb_passwd pw_buf;
@@ -70 +75 @@
 ****************************************************************/
 
-static void gotalarm_sig(void)
+static void gotalarm_sig(int signum)
 {
         gotalarm = 1;
@@ -87 +92 @@
 
         gotalarm = 0;
-        oldsig_handler = CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+        oldsig_handler = CatchSignal(SIGALRM, gotalarm_sig);
 
         lock.l_type = type;
@@ -99 +104 @@
         ret = fcntl(fd, SMB_F_SETLKW, &lock);
         alarm(0);
-        CatchSignal(SIGALRM, SIGNAL_CAST oldsig_handler);
+        CatchSignal(SIGALRM, oldsig_handler);
 
         if (gotalarm && ret == -1) {
@@ -169 +174 @@
                 return;
         ZERO_STRUCTP (user);
-        
+
         user->pass_last_set_time = (time_t)0;
 }
@@ -224 +229 @@
                                 break;
                         }
-        }
-                       
+                default:
+                        DEBUG(10, ("Invalid open mode: %d\n", type));
+                        return NULL;
+        }
+
         for(race_loop = 0; race_loop < 5; race_loop++) {
                 DEBUG(10, ("startsmbfilepwent_internal: opening file %s\n", pfile));
@@ -621 +629 @@
         slprintf((char *)p, new_entry_length - 1 - (p - new_entry),  "%s:LCT-%08X:\n",
                 pdb_encode_acct_ctrl(newpwd->acct_ctrl, NEW_PW_FORMAT_SPACE_PADDED_LEN),
-                (uint32)newpwd->pass_last_set_time);
+                (uint32_t)newpwd->pass_last_set_time);
 
         return new_entry;
@@ -1010 +1018 @@
                         sizeof(ascii_p16)-(strlen(ascii_p16)+1),
                         "%s:LCT-%08X:", 
-                        encode_bits, (uint32)pwd->pass_last_set_time );
+                        encode_bits, (uint32_t)pwd->pass_last_set_time );
                 wr_len = strlen(ascii_p16);
         }
@@ -1174 +1182 @@
          * Do an atomic rename - then release the locks.
          */
+
 #ifdef __OS2__
         endsmbfilepwent(fp, &smbpasswd_state->pw_file_lock_depth);
         endsmbfilepwent(fp_write,&pfile2_lockdepth);
 #endif
-
         if(rename(pfile2,pfile) != 0) {
                 unlink(pfile2);
@@ -1198 +1206 @@
 static bool build_smb_pass (struct smb_passwd *smb_pw, const struct samu *sampass)
 {
-        uint32 rid;
+        uint32_t rid;
 
         if (sampass == NULL) 
@@ -1206 +1214 @@
         if (!IS_SAM_DEFAULT(sampass, PDB_USERSID)) {
                 rid = pdb_get_user_rid(sampass);
-                
+
                 /* If the user specified a RID, make sure its able to be both stored and retreived */
-                if (rid == DOMAIN_USER_RID_GUEST) {
+                if (rid == DOMAIN_RID_GUEST) {
                         struct passwd *passwd = Get_Pwnam_alloc(NULL, lp_guestaccount());
                         if (!passwd) {
-                                DEBUG(0, ("Could not find guest account via getpwnam()! (%s)\n", lp_guestaccount()));
+                                DEBUG(0, ("Could not find guest account via Get_Pwnam_alloc()! (%s)\n", lp_guestaccount()));
                                 return False;
                         }
@@ -1243 +1251 @@
 {
         struct passwd *pwfile;
-        
+
         if ( !sam_pass ) {
                 DEBUG(5,("build_sam_account: struct samu is NULL\n"));
@@ -1256 +1264 @@
                         return False;
         }
-        
+
         if ( !NT_STATUS_IS_OK( samu_set_unix(sam_pass, pwfile )) )
                 return False;
-                
+
         TALLOC_FREE(pwfile);
 
         /* set remaining fields */
-                
+
         if (!pdb_set_nt_passwd (sam_pass, pw_buf->smb_nt_passwd, PDB_SET))
                 return False;
@@ -1271 +1279 @@
         pdb_set_pass_last_set_time (sam_pass, pw_buf->pass_last_set_time, PDB_SET);
         pdb_set_pass_can_change_time (sam_pass, pw_buf->pass_last_set_time, PDB_SET);
-        
+
         return True;
 }
@@ -1307 +1315 @@
         while ( ((smb_pw=getsmbfilepwent(smbpasswd_state, fp)) != NULL)&& (!strequal(smb_pw->smb_name, username)) )
                 /* do nothing....another loop */ ;
-        
+
         endsmbfilepwent(fp, &(smbpasswd_state->pw_file_lock_depth));
 
@@ -1314 +1322 @@
         if (smb_pw == NULL)
                 return nt_status;
-        
+
         DEBUG(10, ("getsampwnam (smbpasswd): found by name: %s\n", smb_pw->smb_name));
 
@@ -1321 +1329 @@
                 return nt_status;
         }
-                
+
         /* now build the struct samu */
         if (!build_sam_account(smbpasswd_state, sam_acct, smb_pw))
@@ -1330 +1338 @@
 }
 
-static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, struct samu *sam_acct, const DOM_SID *sid)
+static NTSTATUS smbpasswd_getsampwsid(struct pdb_methods *my_methods, struct samu *sam_acct, const struct dom_sid *sid)
 {
         NTSTATUS nt_status = NT_STATUS_UNSUCCESSFUL;
@@ -1336 +1344 @@
         struct smb_passwd *smb_pw;
         FILE *fp = NULL;
-        uint32 rid;
-        
+        uint32_t rid;
+
         DEBUG(10, ("smbpasswd_getsampwrid: search by sid: %s\n",
                    sid_string_dbg(sid)));
@@ -1345 +1353 @@
 
         /* More special case 'guest account' hacks... */
-        if (rid == DOMAIN_USER_RID_GUEST) {
+        if (rid == DOMAIN_RID_GUEST) {
                 const char *guest_account = lp_guestaccount();
                 if (!(guest_account && *guest_account)) {
@@ -1371 +1379 @@
         if (smb_pw == NULL)
                 return nt_status;
-        
+
         DEBUG(10, ("getsampwrid (smbpasswd): found by name: %s\n", smb_pw->smb_name));
-                
+
         if (!sam_acct) {
                 DEBUG(10,("getsampwrid: (smbpasswd) struct samu is NULL\n"));
@@ -1384 +1392 @@
 
         /* build_sam_account might change the SID on us, if the name was for the guest account */
-        if (NT_STATUS_IS_OK(nt_status) && !sid_equal(pdb_get_user_sid(sam_acct), sid)) {
+        if (NT_STATUS_IS_OK(nt_status) && !dom_sid_equal(pdb_get_user_sid(sam_acct), sid)) {
                 DEBUG(1, ("looking for user with sid %s instead returned %s "
                           "for account %s!?!\n", sid_string_dbg(sid),
@@ -1400 +1408 @@
         struct smbpasswd_privates *smbpasswd_state = (struct smbpasswd_privates*)my_methods->private_data;
         struct smb_passwd smb_pw;
-        
+
         /* convert the struct samu */
         if (!build_smb_pass(&smb_pw, sampass)) {
                 return NT_STATUS_UNSUCCESSFUL;
         }
-        
+
         /* add the entry */
         return add_smbfilepwd_entry(smbpasswd_state, &smb_pw);
@@ -1414 +1422 @@
         struct smbpasswd_privates *smbpasswd_state = (struct smbpasswd_privates*)my_methods->private_data;
         struct smb_passwd smb_pw;
-        
+
         /* convert the struct samu */
         if (!build_smb_pass(&smb_pw, sampass)) {
@@ -1420 +1428 @@
                 return NT_STATUS_UNSUCCESSFUL;
         }
-        
+
         /* update the entry */
         if(!mod_smbfilepwd_entry(smbpasswd_state, &smb_pw)) {
@@ -1426 +1434 @@
                 return NT_STATUS_UNSUCCESSFUL;
         }
-        
+
         return NT_STATUS_OK;
 }
@@ -1458 +1466 @@
                 return NT_STATUS_NO_MEMORY;
         }
-        
+
         if ( !pdb_copy_sam_account( new_acct, old_acct ) 
                 || !pdb_set_username(new_acct, newname, PDB_CHANGED)) 
@@ -1529 +1537 @@
         if (new_acct)
                 TALLOC_FREE(new_acct);
-        
+
         return (ret);   
 }
@@ -1541 +1549 @@
 {
         struct smbpasswd_privates **privates = (struct smbpasswd_privates**)vp;
-        
+
         endsmbfilepwent((*privates)->pw_file, &((*privates)->pw_file_lock_depth));
-        
+
         *privates = NULL;
         /* No need to free any further, as it is talloc()ed */
@@ -1711 +1719 @@
                 privates->smbpasswd_file = talloc_strdup(*pdb_method, lp_smb_passwd_file());
         }
-        
+
         if (!privates->smbpasswd_file) {
                 DEBUG(0, ("talloc_strdp() failed for storing smbpasswd location!\n"));