Changeset 740 for vendor/current/source3/passdb/passdb.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/passdb/passdb.c (modified) (59 diffs)

vendor/current/source3/passdb/passdb.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "passdb.h"
+#include "system/passwd.h"
 #include "../libcli/auth/libcli_auth.h"
+#include "secrets.h"
+#include "../libcli/security/security.h"
+#include "../lib/util/util_pw.h"
+#include "util_tdb.h"
 
 #undef DBGC_CLASS
@@ -146 +152 @@
         const char *domain = global_myname();
         char *fullname;
-        uint32 urid;
+        uint32_t urid;
 
         if ( !pwd ) {
@@ -194 +200 @@
 
         if ( strequal( pwd->pw_name, guest_account ) ) {
-                if ( !pdb_set_user_sid_from_rid(user, DOMAIN_USER_RID_GUEST, PDB_DEFAULT)) {
+                if ( !pdb_set_user_sid_from_rid(user, DOMAIN_RID_GUEST, PDB_DEFAULT)) {
                         return NT_STATUS_NO_SUCH_USER;
                 }
@@ -242 +248 @@
 
         if ( create && (pdb_capabilities() & PDB_CAP_STORE_RIDS)) {
-                uint32 user_rid;
-                DOM_SID user_sid;
+                uint32_t user_rid;
+                struct dom_sid user_sid;
 
                 if ( !pdb_new_rid( &user_rid ) ) {
@@ -250 +256 @@
                 }
 
-                sid_copy( &user_sid, get_global_sam_sid() );
-                sid_append_rid( &user_sid, user_rid );
+                sid_compose(&user_sid, get_global_sam_sid(), user_rid);
 
                 if ( !pdb_set_user_sid(user, &user_sid, PDB_SET) ) {
@@ -373 +378 @@
 **************************************************************/
 
-void pdb_sethexpwd(char p[33], const unsigned char *pwd, uint32 acct_ctrl)
+void pdb_sethexpwd(char p[33], const unsigned char *pwd, uint32_t acct_ctrl)
 {
         if (pwd != NULL) {
@@ -403 +408 @@
 
         for (i = 0; i < 32; i += 2) {
-                hinybble = toupper_ascii(p[i]);
-                lonybble = toupper_ascii(p[i + 1]);
+                hinybble = toupper_m(p[i]);
+                lonybble = toupper_m(p[i + 1]);
 
                 p1 = strchr(hexchars, hinybble);
@@ -453 +458 @@
 
         for (i = 0; i < 42; i += 2) {
-                hinybble = toupper_ascii(p[i]);
-                lonybble = toupper_ascii(p[i + 1]);
+                hinybble = toupper_m(p[i]);
+                lonybble = toupper_m(p[i + 1]);
 
                 p1 = strchr(hexchars, hinybble);
@@ -497 +502 @@
  ********************************************************************/
 
-uid_t algorithmic_pdb_user_rid_to_uid(uint32 user_rid)
+uid_t algorithmic_pdb_user_rid_to_uid(uint32_t user_rid)
 {
         int rid_offset = algorithmic_rid_base();
@@ -512 +517 @@
  ********************************************************************/
 
-uint32 algorithmic_pdb_uid_to_user_rid(uid_t uid)
+uint32_t algorithmic_pdb_uid_to_user_rid(uid_t uid)
 {
         int rid_offset = algorithmic_rid_base();
-        return (((((uint32)uid)*RID_MULTIPLIER) + rid_offset) | USER_RID_TYPE);
+        return (((((uint32_t)uid)*RID_MULTIPLIER) + rid_offset) | USER_RID_TYPE);
 }
 
@@ -522 +527 @@
  ********************************************************************/
 
-gid_t pdb_group_rid_to_gid(uint32 group_rid)
+gid_t pdb_group_rid_to_gid(uint32_t group_rid)
 {
         int rid_offset = algorithmic_rid_base();
@@ -541 +546 @@
  ********************************************************************/
 
-uint32 algorithmic_pdb_gid_to_group_rid(gid_t gid)
+uint32_t algorithmic_pdb_gid_to_group_rid(gid_t gid)
 {
         int rid_offset = algorithmic_rid_base();
-        return (((((uint32)gid)*RID_MULTIPLIER) + rid_offset) | GROUP_RID_TYPE);
+        return (((((uint32_t)gid)*RID_MULTIPLIER) + rid_offset) | GROUP_RID_TYPE);
 }
 
@@ -551 +556 @@
  ********************************************************************/
 
-static bool rid_is_well_known(uint32 rid)
+static bool rid_is_well_known(uint32_t rid)
 {
         /* Not using rid_offset here, because this is the actual
@@ -563 +568 @@
  ********************************************************************/
 
-bool algorithmic_pdb_rid_is_user(uint32 rid)
+bool algorithmic_pdb_rid_is_user(uint32_t rid)
 {
         if ( rid_is_well_known(rid) ) {
                 /*
-                 * The only well known user RIDs are DOMAIN_USER_RID_ADMIN
-                 * and DOMAIN_USER_RID_GUEST.
+                 * The only well known user RIDs are DOMAIN_RID_ADMINISTRATOR
+                 * and DOMAIN_RID_GUEST.
                  */
-                if(rid == DOMAIN_USER_RID_ADMIN || rid == DOMAIN_USER_RID_GUEST)
+                if(rid == DOMAIN_RID_ADMINISTRATOR || rid == DOMAIN_RID_GUEST)
                         return True;
         } else if((rid & RID_TYPE_MASK) == USER_RID_TYPE) {
@@ -594 +599 @@
 
         if ( strequal( name, "None" ) ) {
-                *rid = DOMAIN_GROUP_RID_USERS;
+                *rid = DOMAIN_RID_USERS;
                 *type = SID_NAME_DOM_GRP;
 
@@ -606 +611 @@
         if ((flags & LOOKUP_NAME_GROUP) == 0) {
                 struct samu *sam_account = NULL;
-                DOM_SID user_sid;
+                struct dom_sid user_sid;
 
                 if ( !(sam_account = samu_new( NULL )) ) {
@@ -927 +932 @@
 *********************************************************************/
 
-static bool init_samu_from_buffer_v0(struct samu *sampass, uint8 *buf, uint32 buflen)
+static bool init_samu_from_buffer_v0(struct samu *sampass, uint8_t *buf, uint32_t buflen)
 {
 
@@ -933 +938 @@
            take care on system with 64bit wide time_t
            --SSS */
-        uint32  logon_time,
+        uint32_t        logon_time,
                 logoff_time,
                 kickoff_time,
@@ -951 +956 @@
         char *acct_desc = NULL;
         char *workstations = NULL;
-        uint32  username_len, domain_len, nt_username_len,
+        uint32_t        username_len, domain_len, nt_username_len,
                 dir_drive_len, unknown_str_len, munged_dial_len,
                 fullname_len, homedir_len, logon_script_len,
                 profile_path_len, acct_desc_len, workstations_len;
 
-        uint32  user_rid, group_rid, remove_me, hours_len, unknown_6;
-        uint16  acct_ctrl, logon_divs;
-        uint16  bad_password_count, logon_count;
-        uint8   *hours = NULL;
-        uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL;
-        uint32          len = 0;
-        uint32          lm_pw_len, nt_pw_len, hourslen;
+        uint32_t        user_rid, group_rid, remove_me, hours_len, unknown_6;
+        uint16_t        acct_ctrl, logon_divs;
+        uint16_t        bad_password_count, logon_count;
+        uint8_t *hours = NULL;
+        uint8_t *lm_pw_ptr = NULL, *nt_pw_ptr = NULL;
+        uint32_t                len = 0;
+        uint32_t                lm_pw_len, nt_pw_len, hourslen;
         bool ret = True;
 
@@ -1005 +1010 @@
                 &unknown_6);                                            /* d */
 
-        if (len == (uint32) -1)  {
+        if (len == (uint32_t) -1)  {
                 ret = False;
                 goto done;
@@ -1086 +1091 @@
         pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
         pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
-        pdb_set_hours(sampass, hours, PDB_SET);
+        pdb_set_hours(sampass, hours, hours_len, PDB_SET);
 
 done:
@@ -1112 +1117 @@
 *********************************************************************/
 
-static bool init_samu_from_buffer_v1(struct samu *sampass, uint8 *buf, uint32 buflen)
+static bool init_samu_from_buffer_v1(struct samu *sampass, uint8_t *buf, uint32_t buflen)
 {
 
@@ -1118 +1123 @@
            take care on system with 64bit wide time_t
            --SSS */
-        uint32  logon_time,
+        uint32_t        logon_time,
                 logoff_time,
                 kickoff_time,
@@ -1137 +1142 @@
         char *acct_desc = NULL;
         char *workstations = NULL;
-        uint32  username_len, domain_len, nt_username_len,
+        uint32_t        username_len, domain_len, nt_username_len,
                 dir_drive_len, unknown_str_len, munged_dial_len,
                 fullname_len, homedir_len, logon_script_len,
                 profile_path_len, acct_desc_len, workstations_len;
 
-        uint32  user_rid, group_rid, remove_me, hours_len, unknown_6;
-        uint16  acct_ctrl, logon_divs;
-        uint16  bad_password_count, logon_count;
-        uint8   *hours = NULL;
-        uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL;
-        uint32          len = 0;
-        uint32          lm_pw_len, nt_pw_len, hourslen;
+        uint32_t        user_rid, group_rid, remove_me, hours_len, unknown_6;
+        uint16_t        acct_ctrl, logon_divs;
+        uint16_t        bad_password_count, logon_count;
+        uint8_t *hours = NULL;
+        uint8_t *lm_pw_ptr = NULL, *nt_pw_ptr = NULL;
+        uint32_t                len = 0;
+        uint32_t                lm_pw_len, nt_pw_len, hourslen;
         bool ret = True;
 
@@ -1193 +1198 @@
                 &unknown_6);                                            /* d */
 
-        if (len == (uint32) -1)  {
+        if (len == (uint32_t) -1)  {
                 ret = False;
                 goto done;
@@ -1278 +1283 @@
         pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
         pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
-        pdb_set_hours(sampass, hours, PDB_SET);
+        pdb_set_hours(sampass, hours, hours_len, PDB_SET);
 
 done:
@@ -1301 +1306 @@
 }
 
-static bool init_samu_from_buffer_v2(struct samu *sampass, uint8 *buf, uint32 buflen)
+static bool init_samu_from_buffer_v2(struct samu *sampass, uint8_t *buf, uint32_t buflen)
 {
 
@@ -1307 +1312 @@
            take care on system with 64bit wide time_t
            --SSS */
-        uint32  logon_time,
+        uint32_t        logon_time,
                 logoff_time,
                 kickoff_time,
@@ -1326 +1331 @@
         char *acct_desc = NULL;
         char *workstations = NULL;
-        uint32  username_len, domain_len, nt_username_len,
+        uint32_t        username_len, domain_len, nt_username_len,
                 dir_drive_len, unknown_str_len, munged_dial_len,
                 fullname_len, homedir_len, logon_script_len,
                 profile_path_len, acct_desc_len, workstations_len;
 
-        uint32  user_rid, group_rid, hours_len, unknown_6;
-        uint16  acct_ctrl, logon_divs;
-        uint16  bad_password_count, logon_count;
-        uint8   *hours = NULL;
-        uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL, *nt_pw_hist_ptr = NULL;
-        uint32          len = 0;
-        uint32          lm_pw_len, nt_pw_len, nt_pw_hist_len, hourslen;
-        uint32 pwHistLen = 0;
+        uint32_t        user_rid, group_rid, hours_len, unknown_6;
+        uint16_t        acct_ctrl, logon_divs;
+        uint16_t        bad_password_count, logon_count;
+        uint8_t *hours = NULL;
+        uint8_t *lm_pw_ptr = NULL, *nt_pw_ptr = NULL, *nt_pw_hist_ptr = NULL;
+        uint32_t                len = 0;
+        uint32_t                lm_pw_len, nt_pw_len, nt_pw_hist_len, hourslen;
+        uint32_t pwHistLen = 0;
         bool ret = True;
         fstring tmp_string;
@@ -1386 +1391 @@
                 &unknown_6);                                            /* d */
 
-        if (len == (uint32) -1)  {
+        if (len == (uint32_t) -1)  {
                 ret = False;
                 goto done;
@@ -1475 +1480 @@
         pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &pwHistLen);
         if (pwHistLen) {
-                uint8 *pw_hist = SMB_MALLOC_ARRAY(uint8, pwHistLen * PW_HISTORY_ENTRY_LEN);
+                uint8_t *pw_hist = SMB_MALLOC_ARRAY(uint8_t, pwHistLen * PW_HISTORY_ENTRY_LEN);
                 if (!pw_hist) {
                         ret = False;
@@ -1509 +1514 @@
         pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
         pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
-        pdb_set_hours(sampass, hours, PDB_SET);
+        pdb_set_hours(sampass, hours, hours_len, PDB_SET);
 
 done:
@@ -1536 +1541 @@
 *********************************************************************/
 
-static bool init_samu_from_buffer_v3(struct samu *sampass, uint8 *buf, uint32 buflen)
+static bool init_samu_from_buffer_v3(struct samu *sampass, uint8_t *buf, uint32_t buflen)
 {
 
@@ -1542 +1547 @@
            take care on system with 64bit wide time_t
            --SSS */
-        uint32  logon_time,
+        uint32_t        logon_time,
                 logoff_time,
                 kickoff_time,
@@ -1561 +1566 @@
         char *acct_desc = NULL;
         char *workstations = NULL;
-        uint32  username_len, domain_len, nt_username_len,
+        uint32_t        username_len, domain_len, nt_username_len,
                 dir_drive_len, comment_len, munged_dial_len,
                 fullname_len, homedir_len, logon_script_len,
                 profile_path_len, acct_desc_len, workstations_len;
 
-        uint32  user_rid, group_rid, hours_len, unknown_6, acct_ctrl;
-        uint16  logon_divs;
-        uint16  bad_password_count, logon_count;
-        uint8   *hours = NULL;
-        uint8   *lm_pw_ptr = NULL, *nt_pw_ptr = NULL, *nt_pw_hist_ptr = NULL;
-        uint32          len = 0;
-        uint32          lm_pw_len, nt_pw_len, nt_pw_hist_len, hourslen;
-        uint32 pwHistLen = 0;
+        uint32_t        user_rid, group_rid, hours_len, unknown_6, acct_ctrl;
+        uint16_t  logon_divs;
+        uint16_t        bad_password_count, logon_count;
+        uint8_t *hours = NULL;
+        uint8_t *lm_pw_ptr = NULL, *nt_pw_ptr = NULL, *nt_pw_hist_ptr = NULL;
+        uint32_t                len = 0;
+        uint32_t                lm_pw_len, nt_pw_len, nt_pw_hist_len, hourslen;
+        uint32_t pwHistLen = 0;
         bool ret = True;
         fstring tmp_string;
@@ -1612 +1617 @@
                 /* Change from V1 is addition of password history field. */
                 &nt_pw_hist_len, &nt_pw_hist_ptr,                       /* B */
-                /* Change from V2 is the uint32 acb_mask */
+                /* Change from V2 is the uint32_t acb_mask */
                 &acct_ctrl,                                             /* d */
                 /* Also "remove_me" field was removed. */
@@ -1622 +1627 @@
                 &unknown_6);                                            /* d */
 
-        if (len == (uint32) -1)  {
+        if (len == (uint32_t) -1)  {
                 ret = False;
                 goto done;
         }
 
-        pdb_set_logon_time(sampass, convert_uint32_to_time_t(logon_time), PDB_SET);
-        pdb_set_logoff_time(sampass, convert_uint32_to_time_t(logoff_time), PDB_SET);
-        pdb_set_kickoff_time(sampass, convert_uint32_to_time_t(kickoff_time), PDB_SET);
-        pdb_set_bad_password_time(sampass, convert_uint32_to_time_t(bad_password_time), PDB_SET);
-        pdb_set_pass_can_change_time(sampass, convert_uint32_to_time_t(pass_can_change_time), PDB_SET);
-        pdb_set_pass_must_change_time(sampass, convert_uint32_to_time_t(pass_must_change_time), PDB_SET);
-        pdb_set_pass_last_set_time(sampass, convert_uint32_to_time_t(pass_last_set_time), PDB_SET);
+        pdb_set_logon_time(sampass, convert_uint32_t_to_time_t(logon_time), PDB_SET);
+        pdb_set_logoff_time(sampass, convert_uint32_t_to_time_t(logoff_time), PDB_SET);
+        pdb_set_kickoff_time(sampass, convert_uint32_t_to_time_t(kickoff_time), PDB_SET);
+        pdb_set_bad_password_time(sampass, convert_uint32_t_to_time_t(bad_password_time), PDB_SET);
+        pdb_set_pass_can_change_time(sampass, convert_uint32_t_to_time_t(pass_can_change_time), PDB_SET);
+        pdb_set_pass_must_change_time(sampass, convert_uint32_t_to_time_t(pass_must_change_time), PDB_SET);
+        pdb_set_pass_last_set_time(sampass, convert_uint32_t_to_time_t(pass_last_set_time), PDB_SET);
 
         pdb_set_username(sampass, username, PDB_SET); 
@@ -1710 +1715 @@
         pdb_get_account_policy(PDB_POLICY_PASSWORD_HISTORY, &pwHistLen);
         if (pwHistLen) {
-                uint8 *pw_hist = (uint8 *)SMB_MALLOC(pwHistLen * PW_HISTORY_ENTRY_LEN);
+                uint8_t *pw_hist = (uint8_t *)SMB_MALLOC(pwHistLen * PW_HISTORY_ENTRY_LEN);
                 if (!pw_hist) {
                         ret = False;
@@ -1741 +1746 @@
         pdb_set_logon_count(sampass, logon_count, PDB_SET);
         pdb_set_unknown_6(sampass, unknown_6, PDB_SET);
-        /* Change from V2 is the uint32 acct_ctrl */
+        /* Change from V2 is the uint32_t acct_ctrl */
         pdb_set_acct_ctrl(sampass, acct_ctrl, PDB_SET);
         pdb_set_logon_divs(sampass, logon_divs, PDB_SET);
-        pdb_set_hours(sampass, hours, PDB_SET);
+        pdb_set_hours(sampass, hours, hours_len, PDB_SET);
 
 done:
@@ -1771 +1776 @@
 *********************************************************************/
 
-static uint32 init_buffer_from_samu_v3 (uint8 **buf, struct samu *sampass, bool size_only)
+static uint32_t init_buffer_from_samu_v3 (uint8_t **buf, struct samu *sampass, bool size_only)
 {
         size_t len, buflen;
@@ -1778 +1783 @@
            take care on system with 64bit wide time_t
            --SSS */
-        uint32  logon_time,
+        uint32_t        logon_time,
                 logoff_time,
                 kickoff_time,
@@ -1786 +1791 @@
                 pass_must_change_time;
 
-        uint32  user_rid, group_rid;
+        uint32_t  user_rid, group_rid;
 
         const char *username;
@@ -1800 +1805 @@
         const char *acct_desc;
         const char *workstations;
-        uint32  username_len, domain_len, nt_username_len,
+        uint32_t        username_len, domain_len, nt_username_len,
                 dir_drive_len, comment_len, munged_dial_len,
                 fullname_len, homedir_len, logon_script_len,
                 profile_path_len, acct_desc_len, workstations_len;
 
-        const uint8 *lm_pw;
-        const uint8 *nt_pw;
-        const uint8 *nt_pw_hist;
-        uint32  lm_pw_len = 16;
-        uint32  nt_pw_len = 16;
-        uint32  nt_pw_hist_len;
-        uint32 pwHistLen = 0;
+        const uint8_t *lm_pw;
+        const uint8_t *nt_pw;
+        const uint8_t *nt_pw_hist;
+        uint32_t        lm_pw_len = 16;
+        uint32_t        nt_pw_len = 16;
+        uint32_t  nt_pw_hist_len;
+        uint32_t pwHistLen = 0;
 
         *buf = NULL;
         buflen = 0;
 
-        logon_time = convert_time_t_to_uint32(pdb_get_logon_time(sampass));
-        logoff_time = convert_time_t_to_uint32(pdb_get_logoff_time(sampass));
-        kickoff_time = convert_time_t_to_uint32(pdb_get_kickoff_time(sampass));
-        bad_password_time = convert_time_t_to_uint32(pdb_get_bad_password_time(sampass));
-        pass_can_change_time = convert_time_t_to_uint32(pdb_get_pass_can_change_time_noncalc(sampass));
-        pass_must_change_time = convert_time_t_to_uint32(pdb_get_pass_must_change_time(sampass));
-        pass_last_set_time = convert_time_t_to_uint32(pdb_get_pass_last_set_time(sampass));
+        logon_time = convert_time_t_to_uint32_t(pdb_get_logon_time(sampass));
+        logoff_time = convert_time_t_to_uint32_t(pdb_get_logoff_time(sampass));
+        kickoff_time = convert_time_t_to_uint32_t(pdb_get_kickoff_time(sampass));
+        bad_password_time = convert_time_t_to_uint32_t(pdb_get_bad_password_time(sampass));
+        pass_can_change_time = convert_time_t_to_uint32_t(pdb_get_pass_can_change_time_noncalc(sampass));
+        pass_must_change_time = convert_time_t_to_uint32_t(pdb_get_pass_must_change_time(sampass));
+        pass_last_set_time = convert_time_t_to_uint32_t(pdb_get_pass_last_set_time(sampass));
 
         user_rid = pdb_get_user_rid(sampass);
@@ -1990 +1995 @@
 
         /* malloc the space needed */
-        if ( (*buf=(uint8*)SMB_MALLOC(len)) == NULL) {
+        if ( (*buf=(uint8_t*)SMB_MALLOC(len)) == NULL) {
                 DEBUG(0,("init_buffer_from_samu_v3: Unable to malloc() memory for buffer!\n"));
                 return (-1);
@@ -2041 +2046 @@
 }
 
-static bool init_samu_from_buffer_v4(struct samu *sampass, uint8 *buf, uint32 buflen)
+static bool init_samu_from_buffer_v4(struct samu *sampass, uint8_t *buf, uint32_t buflen)
 {
         /* nothing changed between V3 and V4 */
@@ -2047 +2052 @@
 }
 
-static uint32 init_buffer_from_samu_v4(uint8 **buf, struct samu *sampass, bool size_only)
+static uint32_t init_buffer_from_samu_v4(uint8_t **buf, struct samu *sampass, bool size_only)
 {
         /* nothing changed between V3 and V4 */
@@ -2058 +2063 @@
 
 bool init_samu_from_buffer(struct samu *sampass, uint32_t level,
-                           uint8 *buf, uint32 buflen)
+                           uint8_t *buf, uint32_t buflen)
 {
         switch (level) {
@@ -2080 +2085 @@
  *********************************************************************/
 
-uint32 init_buffer_from_samu (uint8 **buf, struct samu *sampass, bool size_only)
+uint32_t init_buffer_from_samu (uint8_t **buf, struct samu *sampass, bool size_only)
 {
         return init_buffer_from_samu_v4(buf, sampass, size_only);
@@ -2090 +2095 @@
 bool pdb_copy_sam_account(struct samu *dst, struct samu *src )
 {
-        uint8 *buf = NULL;
+        uint8_t *buf = NULL;
         int len;
 
@@ -2129 +2134 @@
 {
         time_t LastBadPassword;
-        uint16 BadPasswordCount;
-        uint32 resettime; 
+        uint16_t BadPasswordCount;
+        uint32_t resettime;
         bool res;
 
@@ -2149 +2154 @@
 
         /* First, check if there is a reset time to compare */
-        if ((resettime == (uint32) -1) || (resettime == 0)) {
+        if ((resettime == (uint32_t) -1) || (resettime == 0)) {
                 DEBUG(9, ("No reset time, can't reset bad pw count\n"));
                 return True;
@@ -2156 +2161 @@
         LastBadPassword = pdb_get_bad_password_time(sampass);
         DEBUG(7, ("LastBadPassword=%d, resettime=%d, current time=%d.\n", 
-                   (uint32) LastBadPassword, resettime, (uint32)time(NULL)));
-        if (time(NULL) > (LastBadPassword + convert_uint32_to_time_t(resettime)*60)){
+                   (uint32_t) LastBadPassword, resettime, (uint32_t)time(NULL)));
+        if (time(NULL) > (LastBadPassword + convert_uint32_t_to_time_t(resettime)*60)){
                 pdb_set_bad_password_count(sampass, 0, PDB_CHANGED);
                 pdb_set_bad_password_time(sampass, 0, PDB_CHANGED);
@@ -2174 +2179 @@
 bool pdb_update_autolock_flag(struct samu *sampass, bool *updated)
 {
-        uint32 duration;
+        uint32_t duration;
         time_t LastBadPassword;
         bool res;
@@ -2194 +2199 @@
 
         /* First, check if there is a duration to compare */
-        if ((duration == (uint32) -1)  || (duration == 0)) {
+        if ((duration == (uint32_t) -1)  || (duration == 0)) {
                 DEBUG(9, ("pdb_update_autolock_flag: No reset duration, can't reset autolock\n"));
                 return True;
@@ -2201 +2206 @@
         LastBadPassword = pdb_get_bad_password_time(sampass);
         DEBUG(7, ("pdb_update_autolock_flag: Account %s, LastBadPassword=%d, duration=%d, current time =%d.\n",
-                  pdb_get_username(sampass), (uint32)LastBadPassword, duration*60, (uint32)time(NULL)));
+                  pdb_get_username(sampass), (uint32_t)LastBadPassword, duration*60, (uint32_t)time(NULL)));
 
         if (LastBadPassword == (time_t)0) {
@@ -2211 +2216 @@
         }
 
-        if ((time(NULL) > (LastBadPassword + convert_uint32_to_time_t(duration) * 60))) {
+        if ((time(NULL) > (LastBadPassword + convert_uint32_t_to_time_t(duration) * 60))) {
                 pdb_set_acct_ctrl(sampass,
                                   pdb_get_acct_ctrl(sampass) & ~ACB_AUTOLOCK,
@@ -2231 +2236 @@
 bool pdb_increment_bad_password_count(struct samu *sampass)
 {
-        uint32 account_policy_lockout;
+        uint32_t account_policy_lockout;
         bool autolock_updated = False, badpw_updated = False;
         bool ret;
@@ -2367 +2372 @@
 *******************************************************************/
 
-bool get_trust_pw_hash(const char *domain, uint8 ret_pwd[16],
+bool get_trust_pw_hash(const char *domain, uint8_t ret_pwd[16],
                        const char **account_name,
                        enum netr_SchannelType *channel)
@@ -2399 +2404 @@
         return False;
 }
-
-struct samr_LogonHours get_logon_hours_from_pdb(TALLOC_CTX *mem_ctx,
-                                                struct samu *pw)
-{
-        struct samr_LogonHours hours;
-        const int units_per_week = 168;
-
-        ZERO_STRUCT(hours);
-        hours.bits = talloc_array(mem_ctx, uint8_t, units_per_week);
-        if (!hours.bits) {
-                return hours;
-        }
-
-        hours.units_per_week = units_per_week;
-        memset(hours.bits, 0xFF, units_per_week);
-
-        if (pdb_get_hours(pw)) {
-                memcpy(hours.bits, pdb_get_hours(pw),
-                       MIN(pdb_get_hours_len(pw), units_per_week));
-        }
-
-        return hours;
-}