Changes from APPLIANCE_HEAD:
[ira/wip.git] / source3 / passdb / passdb.c
index 30ea1d9bd6e98bc37fd4460170fab1529f33d368..42c0176fc53e6cea6608d447e84b086a48d29d42 100644 (file)
@@ -2,8 +2,9 @@
    Unix SMB/Netbios implementation.
    Version 1.9.
    Password and authentication handling
-   Copyright (C) Jeremy Allison 1996-1998
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1998
+   Copyright (C) Jeremy Allison                1996-1998
+   Copyright (C) Luke Kenneth Casson Leighton  1996-1998
+   Copyright (C) Gerald (Jerry) Carter         2000
       
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,8 +21,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <dlfcn.h>
 #include "includes.h"
-#include "nterr.h"
 
 extern int DEBUGLEVEL;
 
@@ -32,528 +33,181 @@ extern int DEBUGLEVEL;
  */
 
 extern DOM_SID global_sam_sid;
-extern pstring global_myname;
-extern fstring global_myworkgroup;
 
-/*
- * NOTE. All these functions are abstracted into a structure
- * that points to the correct function for the selected database. JRA.
- *
- * NOTE.  for the get/mod/add functions, there are two sets of functions.
- * one supports struct sam_passwd, the other supports struct smb_passwd.
- * for speed optimisation it is best to support both these sets.
- * 
- * it is, however, optional to support one set but not the other: there
- * is conversion-capability built in to passdb.c, and run-time error
- * detection for when neither are supported.
- * 
- * password database writers are recommended to implement the sam_passwd
- * functions in a first pass, as struct sam_passwd contains more
- * information, needed by the NT Domain support.
- * 
- * a full example set of derivative functions are listed below.  an API
- * writer is expected to cut/paste these into their module, replace
- * either one set (struct smb_passwd) or the other (struct sam_passwd)
- * OR both, and optionally also to write display info routines
- * (struct sam_disp_info).  lkcl
- *
- */
+struct passdb_ops *pdb_ops;
 
-static struct passdb_ops *pdb_ops;
+static void* pdb_handle = NULL;
 
 /***************************************************************
  Initialize the password db operations.
 ***************************************************************/
-
-BOOL initialize_password_db(void)
-{
-  if (pdb_ops)
-  {
-    return True;
-  }
-
-#ifdef WITH_NISPLUS
-  pdb_ops =  nisplus_initialize_password_db();
-#elif defined(WITH_LDAP)
-  pdb_ops = ldap_initialize_password_db();
-#else 
-  pdb_ops = file_initialize_password_db();
-#endif 
-
-  return (pdb_ops != NULL);
-}
-
-/*
- * Functions that return/manipulate a struct smb_passwd.
- */
-
-/************************************************************************
- Utility function to search smb passwd by rid.  
-*************************************************************************/
-
-struct smb_passwd *iterate_getsmbpwrid(uint32 user_rid)
-{
-       return iterate_getsmbpwuid(pdb_user_rid_to_uid(user_rid));
-}
-
-/************************************************************************
- Utility function to search smb passwd by uid.  use this if your database
- does not have search facilities.
-*************************************************************************/
-
-struct smb_passwd *iterate_getsmbpwuid(uid_t smb_userid)
-{
-       struct smb_passwd *pwd = NULL;
-       void *fp = NULL;
-
-       DEBUG(10, ("search by smb_userid: %x\n", (int)smb_userid));
-
-       /* Open the smb password database - not for update. */
-       fp = startsmbpwent(False);
-
-       if (fp == NULL)
-       {
-               DEBUG(0, ("unable to open smb password database.\n"));
-               return NULL;
-       }
-
-       while ((pwd = getsmbpwent(fp)) != NULL && pwd->smb_userid != smb_userid)
-      ;
-
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by smb_userid: %x\n", (int)smb_userid));
-       }
-
-       endsmbpwent(fp);
-       return pwd;
-}
-
-/************************************************************************
- Utility function to search smb passwd by name.  use this if your database
- does not have search facilities.
-*************************************************************************/
-
-struct smb_passwd *iterate_getsmbpwnam(char *name)
-{
-       struct smb_passwd *pwd = NULL;
-       void *fp = NULL;
-
-       DEBUG(10, ("search by name: %s\n", name));
-
-       /* Open the sam password file - not for update. */
-       fp = startsmbpwent(False);
-
-       if (fp == NULL)
-       {
-               DEBUG(0, ("unable to open smb password database.\n"));
-               return NULL;
-       }
-
-       while ((pwd = getsmbpwent(fp)) != NULL && !strequal(pwd->smb_name, name))
-      ;
-
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by name: %s\n", name));
-       }
-
-       endsmbpwent(fp);
-       return pwd;
-}
-
-/***************************************************************
- Start to enumerate the smb or sam passwd list. Returns a void pointer
- to ensure no modification outside this module.
-
- Note that currently it is being assumed that a pointer returned
- from this function may be used to enumerate struct sam_passwd
- entries as well as struct smb_passwd entries. This may need
- to change. JRA.
-
-****************************************************************/
-
-void *startsmbpwent(BOOL update)
-{
-  return pdb_ops->startsmbpwent(update);
-}
-
-/***************************************************************
- End enumeration of the smb or sam passwd list.
-
- Note that currently it is being assumed that a pointer returned
- from this function may be used to enumerate struct sam_passwd
- entries as well as struct smb_passwd entries. This may need
- to change. JRA.
-
-****************************************************************/
-
-void endsmbpwent(void *vp)
-{
-  pdb_ops->endsmbpwent(vp);
-}
-
-/*************************************************************************
- Routine to return the next entry in the smb passwd list.
- *************************************************************************/
-
-struct smb_passwd *getsmbpwent(void *vp)
-{
-       return pdb_ops->getsmbpwent(vp);
-}
-
-/************************************************************************
- Routine to add an entry to the smb passwd file.
-*************************************************************************/
-
-BOOL add_smbpwd_entry(struct smb_passwd *newpwd)
-{
-       return pdb_ops->add_smbpwd_entry(newpwd);
-}
-
-/************************************************************************
- Routine to search the smb passwd file for an entry matching the username.
- and then modify its password entry. We can't use the startsampwent()/
- getsampwent()/endsampwent() interfaces here as we depend on looking
- in the actual file to decide how much room we have to write data.
- override = False, normal
- override = True, override XXXXXXXX'd out password or NO PASS
-************************************************************************/
-
-BOOL mod_smbpwd_entry(struct smb_passwd* pwd, BOOL override)
-{
-       return pdb_ops->mod_smbpwd_entry(pwd, override);
-}
-
-/************************************************************************
- Routine to delete an entry from the smb passwd file.
-*************************************************************************/
-
-BOOL del_smbpwd_entry(const char *name)
-{
-       return pdb_ops->del_smbpwd_entry(name);
-}
-
-/************************************************************************
- Routine to search smb passwd by name.
-*************************************************************************/
-
-struct smb_passwd *getsmbpwnam(char *name)
-{
-       return pdb_ops->getsmbpwnam(name);
-}
-
-/************************************************************************
- Routine to search smb passwd by user rid.
-*************************************************************************/
-
-struct smb_passwd *getsmbpwrid(uint32 user_rid)
-{
-       return pdb_ops->getsmbpwrid(user_rid);
-}
-
-/************************************************************************
- Routine to search smb passwd by uid.
-*************************************************************************/
-
-struct smb_passwd *getsmbpwuid(uid_t smb_userid)
-{
-       return pdb_ops->getsmbpwuid(smb_userid);
-}
-
-/*
- * Functions that manupulate a struct sam_passwd.
- */
-
-/************************************************************************
- Utility function to search sam passwd by name.  use this if your database
- does not have search facilities.
-*************************************************************************/
-
-struct sam_passwd *iterate_getsam21pwnam(char *name)
-{
-       struct sam_passwd *pwd = NULL;
-       void *fp = NULL;
-
-       DEBUG(10, ("search by name: %s\n", name));
-
-       /* Open the smb password database - not for update. */
-       fp = startsmbpwent(False);
-
-       if (fp == NULL)
-       {
-               DEBUG(0, ("unable to open sam password database.\n"));
-               return NULL;
-       }
-
-       while ((pwd = getsam21pwent(fp)) != NULL && !strequal(pwd->smb_name, name))
-       {
-               DEBUG(10, ("iterate: %s 0x%x\n", pwd->smb_name, pwd->user_rid));
-       }
-
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by name: %s\n", name));
-       }
-
-       endsmbpwent(fp);
-       return pwd;
-}
-
-/************************************************************************
- Utility function to search sam passwd by rid.  use this if your database
- does not have search facilities.
-
- search capability by both rid and uid are needed as the rid <-> uid
- mapping may be non-monotonic.  
-
-*************************************************************************/
-
-struct sam_passwd *iterate_getsam21pwrid(uint32 rid)
+BOOL initialize_password_db(BOOL reload)
 {
-       struct sam_passwd *pwd = NULL;
-       void *fp = NULL;
 
-       DEBUG(10, ("search by rid: %x\n", rid));
-
-       /* Open the smb password file - not for update. */
-       fp = startsmbpwent(False);
-
-       if (fp == NULL)
-       {
-               DEBUG(0, ("unable to open sam password database.\n"));
-               return NULL;
-       }
-
-       while ((pwd = getsam21pwent(fp)) != NULL && pwd->user_rid != rid)
-       {
-               DEBUG(10, ("iterate: %s 0x%x\n", pwd->smb_name, pwd->user_rid));
-       }
-
-       if (pwd != NULL)
+       char*   modulename = lp_passdb_module_path();
+       
+       return True;
+       
+       /* load another module? */
+       if (reload && pdb_handle)
        {
-               DEBUG(10, ("found by user_rid: %x\n", rid));
+               dlclose (pdb_handle);
+               pdb_handle = NULL;
        }
-
-       endsmbpwent(fp);
-       return pwd;
-}
-
-/************************************************************************
- Utility function to search sam passwd by uid.  use this if your database
- does not have search facilities.
-
- search capability by both rid and uid are needed as the rid <-> uid
- mapping may be non-monotonic.  
-
-*************************************************************************/
-
-struct sam_passwd *iterate_getsam21pwuid(uid_t uid)
-{
-       struct sam_passwd *pwd = NULL;
-       void *fp = NULL;
-
-       DEBUG(10, ("search by uid: %x\n", (int)uid));
-
-       /* Open the smb password file - not for update. */
-       fp = startsmbpwent(False);
-
-       if (fp == NULL)
+       
+       /* do we have a module defined or use the default? */
+       if (strlen (modulename) != 0)
        {
-               DEBUG(0, ("unable to open sam password database.\n"));
-               return NULL;
-       }
-
-       while ((pwd = getsam21pwent(fp)) != NULL && pwd->smb_userid != uid)
-      ;
-
-       if (pwd != NULL)
+               if ((pdb_handle=dlopen (modulename, RTLD_LAZY)) == NULL)
+               {
+                       DEBUG(0,("initialize_password_db: ERROR - Unable to open passdb module \"%s\"!\n%s\n",
+                               modulename, dlerror()));
+               }
+               else
+                       DEBUG(1,("initialize_password_db: passdb module \"%s\" loaded successfully\n", modulename));
+       }       
+       
+       /* either no module name defined or the one that was failed 
+          to open.  Let's try the default */
+       if (pdb_handle == NULL)
        {
-               DEBUG(10, ("found by smb_userid: %x\n", (int)uid));
+               if ((pdb_handle=dlopen ("libpdbfile.so", RTLD_LAZY)) == NULL)
+               {
+                       DEBUG(0,("initialize_password_db: ERROR - Unable to open \"libpdbfile.so\" passdb module!  No user authentication possible!\n%s\n",
+                               dlerror()));
+                       return False;
+               }
+               else
+                       DEBUG(1,("initialize_password_db: passdb module \"libpdbfile.so\" loaded successfully\n"));
        }
+                                       
 
-       endsmbpwent(fp);
-       return pwd;
-}
-
-/*************************************************************************
- Routine to return a display info structure, by rid
- *************************************************************************/
-struct sam_disp_info *getsamdisprid(uint32 rid)
-{
-       return pdb_ops->getsamdisprid(rid);
-}
-
-/*************************************************************************
- Routine to return the next entry in the sam passwd list.
- *************************************************************************/
-
-struct sam_passwd *getsam21pwent(void *vp)
-{
-       return pdb_ops->getsam21pwent(vp);
-}
-
-
-/************************************************************************
- Routine to search sam passwd by name.
-*************************************************************************/
-
-struct sam_passwd *getsam21pwnam(char *name)
-{
-       return pdb_ops->getsam21pwnam(name);
-}
-
-/************************************************************************
- Routine to search sam passwd by rid.  
-*************************************************************************/
-
-struct sam_passwd *getsam21pwrid(uint32 rid)
-{
-       return pdb_ops->getsam21pwrid(rid);
+       return (pdb_handle != NULL);
 }
 
-
-/**********************************************************
- **********************************************************
-
- utility routines which are likely to be useful to all password
- databases
-
- **********************************************************
- **********************************************************/
-
 /*************************************************************
  initialises a struct sam_disp_info.
  **************************************************************/
-
 static void pdb_init_dispinfo(struct sam_disp_info *user)
 {
-       if (user == NULL) return;
-       memset((char *)user, '\0', sizeof(*user));
-}
-
-/*************************************************************
- initialises a struct smb_passwd.
- **************************************************************/
-
-void pdb_init_smb(struct smb_passwd *user)
-{
-       if (user == NULL) return;
-       memset((char *)user, '\0', sizeof(*user));
-       user->pass_last_set_time    = (time_t)-1;
+       if (user == NULL) 
+               return;
+       ZERO_STRUCTP(user);
 }
 
 /*************************************************************
  initialises a struct sam_passwd.
- **************************************************************/
-void pdb_init_sam(struct sam_passwd *user)
+ ************************************************************/
+void pdb_init_sam(SAM_ACCOUNT *user)
 {
-       if (user == NULL) return;
-       memset((char *)user, '\0', sizeof(*user));
-       user->logon_time            = (time_t)-1;
+       if (user == NULL) 
+               return;
+       
+       ZERO_STRUCTP(user);
+       
+       user->logon_time            = (time_t)0;
        user->logoff_time           = (time_t)-1;
        user->kickoff_time          = (time_t)-1;
        user->pass_last_set_time    = (time_t)-1;
        user->pass_can_change_time  = (time_t)-1;
        user->pass_must_change_time = (time_t)-1;
+
+       user->unknown_3 = 0x00ffffff;   /* don't know */
+       user->logon_divs = 168;         /* hours per week */
+       user->hours_len = 21;           /* 21 times 8 bits = 168 */
+       memset(user->hours, 0xff, user->hours_len); /* available at all hours */
+       user->unknown_5 = 0x00020000;   /* don't know */
+       user->unknown_5 = 0x000004ec;   /* don't know */
+       
+}
+
+/************************************************************
+ free all pointer members and then reinit the SAM_ACCOUNT
+ ***********************************************************/
+void pdb_clear_sam(SAM_ACCOUNT *user)
+{
+       /* do we have a SAM_CCOUTN struct to work with? */
+       if (user == NULL)
+               return;
+               
+       /* do we own the memory? */
+       if  (user->own_memory) 
+       {
+               /* clear all pointer members */
+               if (user->username)     free(user->username);
+               if (user->full_name)    free(user->full_name);
+               if (user->domain)       free(user->domain);
+               if (user->nt_username)  free(user->nt_username);
+               if (user->home_dir)     free(user->home_dir);
+               if (user->dir_drive)    free(user->dir_drive);
+               if (user->logon_script) free(user->logon_script);
+               if (user->profile_path) free(user->profile_path);
+               if (user->acct_desc)    free(user->acct_desc);
+               if (user->workstations) free(user->workstations);
+               if (user->unknown_str)  free(user->unknown_str);
+               if (user->munged_dial)  free(user->munged_dial);
+                       
+               if (user->lm_pw)        free(user->lm_pw);
+               if (user->nt_pw)        free(user->nt_pw);
+       }
+       
+       /* now initialize */
+       pdb_init_sam(user);
+       
 }
 
+
 /*************************************************************************
  Routine to return the next entry in the sam passwd list.
  *************************************************************************/
-
-struct sam_disp_info *pdb_sam_to_dispinfo(struct sam_passwd *user)
+struct sam_disp_info *pdb_sam_to_dispinfo(SAM_ACCOUNT *user)
 {
        static struct sam_disp_info disp_info;
 
-       if (user == NULL) return NULL;
+       if (user == NULL) 
+               return NULL;
 
        pdb_init_dispinfo(&disp_info);
 
-       disp_info.smb_name  = user->smb_name;
+       disp_info.smb_name  = user->username;
        disp_info.full_name = user->full_name;
        disp_info.user_rid  = user->user_rid;
 
        return &disp_info;
 }
 
-/*************************************************************
- converts a sam_passwd structure to a smb_passwd structure.
- **************************************************************/
-
-struct smb_passwd *pdb_sam_to_smb(struct sam_passwd *user)
-{
-       static struct smb_passwd pw_buf;
-
-       if (user == NULL) return NULL;
-
-       pdb_init_smb(&pw_buf);
-
-       pw_buf.smb_userid         = user->smb_userid;
-       pw_buf.smb_name           = user->smb_name;
-       pw_buf.smb_passwd         = user->smb_passwd;
-       pw_buf.smb_nt_passwd      = user->smb_nt_passwd;
-       pw_buf.acct_ctrl          = user->acct_ctrl;
-       pw_buf.pass_last_set_time = user->pass_last_set_time;
-
-       return &pw_buf;
-}
-
-
-/*************************************************************
- converts a smb_passwd structure to a sam_passwd structure.
- **************************************************************/
-
-struct sam_passwd *pdb_smb_to_sam(struct smb_passwd *user)
-{
-       static struct sam_passwd pw_buf;
-
-       if (user == NULL) return NULL;
-
-       pdb_init_sam(&pw_buf);
-
-       pw_buf.smb_userid         = user->smb_userid;
-       pw_buf.smb_name           = user->smb_name;
-       pw_buf.smb_passwd         = user->smb_passwd;
-       pw_buf.smb_nt_passwd      = user->smb_nt_passwd;
-       pw_buf.acct_ctrl          = user->acct_ctrl;
-       pw_buf.pass_last_set_time = user->pass_last_set_time;
-
-       return &pw_buf;
-}
 
 /**********************************************************
  Encode the account control bits into a string.
  length = length of string to encode into (including terminating
  null). length *MUST BE MORE THAN 2* !
  **********************************************************/
-
 char *pdb_encode_acct_ctrl(uint16 acct_ctrl, size_t length)
 {
-  static fstring acct_str;
-  size_t i = 0;
-
-  acct_str[i++] = '[';
-
-  if (acct_ctrl & ACB_PWNOTREQ ) acct_str[i++] = 'N';
-  if (acct_ctrl & ACB_DISABLED ) acct_str[i++] = 'D';
-  if (acct_ctrl & ACB_HOMDIRREQ) acct_str[i++] = 'H';
-  if (acct_ctrl & ACB_TEMPDUP  ) acct_str[i++] = 'T'; 
-  if (acct_ctrl & ACB_NORMAL   ) acct_str[i++] = 'U';
-  if (acct_ctrl & ACB_MNS      ) acct_str[i++] = 'M';
-  if (acct_ctrl & ACB_WSTRUST  ) acct_str[i++] = 'W';
-  if (acct_ctrl & ACB_SVRTRUST ) acct_str[i++] = 'S';
-  if (acct_ctrl & ACB_AUTOLOCK ) acct_str[i++] = 'L';
-  if (acct_ctrl & ACB_PWNOEXP  ) acct_str[i++] = 'X';
-  if (acct_ctrl & ACB_DOMTRUST ) acct_str[i++] = 'I';
-
-  for ( ; i < length - 2 ; i++ ) { acct_str[i] = ' '; }
-
-  i = length - 2;
-  acct_str[i++] = ']';
-  acct_str[i++] = '\0';
-
-  return acct_str;
+       static fstring acct_str;
+       size_t i = 0;
+
+       acct_str[i++] = '[';
+
+       if (acct_ctrl & ACB_PWNOTREQ ) acct_str[i++] = 'N';
+       if (acct_ctrl & ACB_DISABLED ) acct_str[i++] = 'D';
+       if (acct_ctrl & ACB_HOMDIRREQ) acct_str[i++] = 'H';
+       if (acct_ctrl & ACB_TEMPDUP  ) acct_str[i++] = 'T'; 
+       if (acct_ctrl & ACB_NORMAL   ) acct_str[i++] = 'U';
+       if (acct_ctrl & ACB_MNS      ) acct_str[i++] = 'M';
+       if (acct_ctrl & ACB_WSTRUST  ) acct_str[i++] = 'W';
+       if (acct_ctrl & ACB_SVRTRUST ) acct_str[i++] = 'S';
+       if (acct_ctrl & ACB_AUTOLOCK ) acct_str[i++] = 'L';
+       if (acct_ctrl & ACB_PWNOEXP  ) acct_str[i++] = 'X';
+       if (acct_ctrl & ACB_DOMTRUST ) acct_str[i++] = 'I';
+
+       for ( ; i < length - 2 ; i++ ) { acct_str[i] = ' '; }
+
+       i = length - 2;
+       acct_str[i++] = ']';
+       acct_str[i++] = '\0';
+
+       return acct_str;
 }     
 
 /**********************************************************
@@ -603,142 +257,38 @@ uint16 pdb_decode_acct_ctrl(const char *p)
        return acct_ctrl;
 }
 
-/*******************************************************************
- gets password-database-format time from a string.
- ********************************************************************/
+/*************************************************************
+ Routine to set 32 hex password characters from a 16 byte array.
+**************************************************************/
+void pdb_sethexpwd(char *p, unsigned char *pwd, uint16 acct_ctrl)
+{
+       if (pwd != NULL) {
+               int i;
+               for (i = 0; i < 16; i++)
+                       slprintf(&p[i*2], 3, "%02X", pwd[i]);
+       } else {
+               if (acct_ctrl & ACB_PWNOTREQ)
+                       safe_strcpy(p, "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX", 33);
+               else
+                       safe_strcpy(p, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 33);
+       }
+}
 
-static time_t get_time_from_string(const char *p)
+/*************************************************************
+ Routine to get the 32 hex characters and turn them
+ into a 16 byte array.
+**************************************************************/
+BOOL pdb_gethexpwd(char *p, unsigned char *pwd)
 {
        int i;
+       unsigned char   lonybble, hinybble;
+       char           *hexchars = "0123456789ABCDEF";
+       char           *p1, *p2;
 
-       for (i = 0; i < 8; i++)
-       {
-               if (p[i] == '\0' || !isxdigit((int)(p[i]&0xFF)))
-               break;
-       }
-       if (i == 8)
+       for (i = 0; i < 32; i += 2)
        {
-               /*
-                * p points at 8 characters of hex digits - 
-                * read into a time_t as the seconds since
-                * 1970 that the password was last changed.
-                */
-               return (time_t)strtol(p, NULL, 16);
-       }
-       return (time_t)-1;
-}
-
-/*******************************************************************
- gets password last set time
- ********************************************************************/
-
-time_t pdb_get_last_set_time(const char *p)
-{
-       if (*p && StrnCaseCmp(p, "LCT-", 4))
-       {
-               return get_time_from_string(p + 4);
-       }
-       return (time_t)-1;
-}
-
-
-/*******************************************************************
- sets password-database-format time in a string.
- ********************************************************************/
-static void set_time_in_string(char *p, int max_len, char *type, time_t t)
-{
-       slprintf(p, max_len, ":%s-%08X:", type, (uint32)t);
-}
-
-/*******************************************************************
- sets logon time
- ********************************************************************/
-void pdb_set_logon_time(char *p, int max_len, time_t t)
-{
-       set_time_in_string(p, max_len, "LNT", t);
-}
-
-/*******************************************************************
- sets logoff time
- ********************************************************************/
-void pdb_set_logoff_time(char *p, int max_len, time_t t)
-{
-       set_time_in_string(p, max_len, "LOT", t);
-}
-
-/*******************************************************************
- sets kickoff time
- ********************************************************************/
-void pdb_set_kickoff_time(char *p, int max_len, time_t t)
-{
-       set_time_in_string(p, max_len, "KOT", t);
-}
-
-/*******************************************************************
- sets password can change time
- ********************************************************************/
-void pdb_set_can_change_time(char *p, int max_len, time_t t)
-{
-       set_time_in_string(p, max_len, "CCT", t);
-}
-
-/*******************************************************************
- sets password last set time
- ********************************************************************/
-void pdb_set_must_change_time(char *p, int max_len, time_t t)
-{
-       set_time_in_string(p, max_len, "MCT", t);
-}
-
-/*******************************************************************
- sets password last set time
- ********************************************************************/
-void pdb_set_last_set_time(char *p, int max_len, time_t t)
-{
-       set_time_in_string(p, max_len, "LCT", t);
-}
-
-
-/*************************************************************
- Routine to set 32 hex password characters from a 16 byte array.
-**************************************************************/
-void pdb_sethexpwd(char *p, unsigned char *pwd, uint16 acct_ctrl)
-{
-       if (pwd != NULL)
-       {
-               int i;
-               for (i = 0; i < 16; i++)
-               {
-                       slprintf(&p[i*2], 3, "%02X", pwd[i]);
-               }
-       }
-       else
-       {
-               if (IS_BITS_SET_ALL(acct_ctrl, ACB_PWNOTREQ))
-               {
-                       safe_strcpy(p, "NO PASSWORDXXXXXXXXXXXXXXXXXXXXX", 33);
-               }
-               else
-               {
-                       safe_strcpy(p, "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", 33);
-               }
-       }
-}
-/*************************************************************
- Routine to get the 32 hex characters and turn them
- into a 16 byte array.
-**************************************************************/
-BOOL pdb_gethexpwd(char *p, unsigned char *pwd)
-{
-       int i;
-       unsigned char   lonybble, hinybble;
-       char           *hexchars = "0123456789ABCDEF";
-       char           *p1, *p2;
-
-       for (i = 0; i < 32; i += 2)
-       {
-               hinybble = toupper(p[i]);
-               lonybble = toupper(p[i + 1]);
+               hinybble = toupper(p[i]);
+               lonybble = toupper(p[i + 1]);
 
                p1 = strchr(hexchars, hinybble);
                p2 = strchr(hexchars, lonybble);
@@ -759,10 +309,9 @@ BOOL pdb_gethexpwd(char *p, unsigned char *pwd)
 /*******************************************************************
  Group and User RID username mapping function
  ********************************************************************/
-
 BOOL pdb_name_to_rid(char *user_name, uint32 *u_rid, uint32 *g_rid)
 {
-    struct passwd *pw = Get_Pwnam(user_name, False);
+       struct passwd *pw = Get_Pwnam(user_name, False);
 
        if (u_rid == NULL || g_rid == NULL || user_name == NULL)
        {
@@ -796,97 +345,9 @@ BOOL pdb_name_to_rid(char *user_name, uint32 *u_rid, uint32 *g_rid)
        return True;
 }
 
-/****************************************************************************
- Generate the global machine sid. Look for the DOMAINNAME.SID file first, if
- not found then look in smb.conf and use it to create the DOMAINNAME.SID file.
-****************************************************************************/
-BOOL pdb_generate_sam_sid(char *domain_name, DOM_SID *sid)
-{
-       char *p;
-       pstring sid_file;
-       pstring machine_sid_file;
-       fstring file_name;
-
-       if (sid == NULL)
-       {
-               sid = &global_sam_sid;
-       }
-
-       pstrcpy(sid_file, lp_smb_passwd_file());
-
-       if (sid_file[0] == 0)
-       {
-               DEBUG(0,("cannot find smb passwd file\n"));
-               return False;
-       }
-
-       p = strrchr(sid_file, '/');
-       if (p != NULL)
-       {
-               *++p = '\0';
-       }
-
-       if (!directory_exist(sid_file, NULL)) {
-               if (mkdir(sid_file, 0700) != 0) {
-                       DEBUG(0,("can't create private directory %s : %s\n",
-                                sid_file, strerror(errno)));
-                       return False;
-               }
-       }
-
-       pstrcpy(machine_sid_file, sid_file);
-       pstrcat(machine_sid_file, "MACHINE.SID");
-
-       slprintf(file_name, sizeof(file_name)-1, "%s.SID", domain_name);
-       strupper(file_name);
-       pstrcat(sid_file, file_name);
-    
-       if (file_exist(machine_sid_file, NULL))
-       {
-               if (file_exist(sid_file, NULL))
-               {
-                       DEBUG(0,("both %s and %s exist when only one should, unable to continue\n",
-                                 machine_sid_file, sid_file));
-                       return False;
-               }
-               if (file_rename(machine_sid_file, sid_file))
-               {
-                       DEBUG(0,("could not rename %s to %s.  Error was %s\n",
-                                 machine_sid_file, sid_file, strerror(errno)));
-                       return False;
-               }
-       }
-       
-       /* attempt to read the SID from the file */
-       if (read_sid(domain_name, sid))
-       {
-               return True;
-       }
-  
-       if (!create_new_sid(sid))
-       {
-               return False;
-       }
-       /* attempt to read the SID from the file */
-       if (!write_sid(domain_name, sid))
-       {
-               return True;
-       }
-  
-       /* during the attempt to write, someone else wrote? */
-
-       /* attempt to read the SID from the file */
-       if (read_sid(domain_name, sid))
-       {
-               return True;
-       }
-  
-       return True;
-}   
 /*******************************************************************
  Converts NT user RID to a UNIX uid.
  ********************************************************************/
-
 uid_t pdb_user_rid_to_uid(uint32 user_rid)
 {
        return (uid_t)(((user_rid & (~USER_RID_TYPE))- 1000)/RID_MULTIPLIER);
@@ -931,7 +392,6 @@ static BOOL pdb_rid_is_well_known(uint32 rid)
 /*******************************************************************
  Decides if a RID is a user or group RID.
  ********************************************************************/
-  
 BOOL pdb_rid_is_user(uint32 rid)
 {
   /* lkcl i understand that NT attaches an enumeration to a RID
@@ -954,13 +414,12 @@ BOOL pdb_rid_is_user(uint32 rid)
 /*******************************************************************
  Convert a rid into a name. Used in the lookup SID rpc.
  ********************************************************************/
-
-BOOL lookup_local_rid(uint32 rid, char *name, uint8 *psid_name_use)
+BOOL local_lookup_rid(uint32 rid, char *name, enum SID_NAME_USE *psid_name_use)
 {
 
        BOOL is_user = pdb_rid_is_user(rid);
 
-       DEBUG(5,("lookup_local_rid: looking up %s RID %u.\n", is_user ? "user" :
+       DEBUG(5,("local_lookup_rid: looking up %s RID %u.\n", is_user ? "user" :
                        "group", (unsigned int)rid));
 
        if(is_user) {
@@ -977,12 +436,22 @@ BOOL lookup_local_rid(uint32 rid, char *name, uint8 *psid_name_use)
                        if(!next_token(&p, name, NULL, sizeof(fstring)))
                                fstrcpy(name, "Guest");
                } else {
-                       uid_t uid = pdb_user_rid_to_uid(rid);
-                       struct passwd *pass = sys_getpwuid(uid);
+                       uid_t uid;
+                       struct passwd *pass;
+                       
+                       /*
+                        * Don't try to convert the rid to a name if 
+                        * running in appliance mode
+                        */
+                       if (lp_hide_local_users())
+                               return False;
+                       
+                       uid = pdb_user_rid_to_uid(rid);
+                       pass = sys_getpwuid(uid);
 
                        *psid_name_use = SID_NAME_USER;
 
-                       DEBUG(5,("lookup_local_rid: looking up uid %u %s\n", (unsigned int)uid,
+                       DEBUG(5,("local_lookup_rid: looking up uid %u %s\n", (unsigned int)uid,
                                pass ? "succeeded" : "failed" ));
 
                        if(!pass) {
@@ -992,17 +461,28 @@ BOOL lookup_local_rid(uint32 rid, char *name, uint8 *psid_name_use)
 
                        fstrcpy(name, pass->pw_name);
 
-                       DEBUG(5,("lookup_local_rid: found user %s for rid %u\n", name,
+                       DEBUG(5,("local_lookup_rid: found user %s for rid %u\n", name,
                                (unsigned int)rid ));
                }
 
        } else {
-               gid_t gid = pdb_user_rid_to_gid(rid);
-               struct group *gr = getgrgid(gid);
+               gid_t gid;
+               struct group *gr; 
+
+               /* 
+                * Don't try to convert the rid to a name if running
+                * in appliance mode
+                */
+               
+               if (lp_hide_local_users()) 
+                       return False;
+               
+               gid = pdb_user_rid_to_gid(rid);
+               gr = getgrgid(gid);
 
                *psid_name_use = SID_NAME_ALIAS;
 
-               DEBUG(5,("lookup_local_rid: looking up gid %u %s\n", (unsigned int)gid,
+               DEBUG(5,("local_local_rid: looking up gid %u %s\n", (unsigned int)gid,
                        gr ? "succeeded" : "failed" ));
 
                if(!gr) {
@@ -1012,7 +492,7 @@ BOOL lookup_local_rid(uint32 rid, char *name, uint8 *psid_name_use)
 
                fstrcpy( name, gr->gr_name);
 
-               DEBUG(5,("lookup_local_rid: found group %s for rid %u\n", name,
+               DEBUG(5,("local_lookup_rid: found group %s for rid %u\n", name,
                        (unsigned int)rid ));
        }
 
@@ -1023,7 +503,7 @@ BOOL lookup_local_rid(uint32 rid, char *name, uint8 *psid_name_use)
  Convert a name into a SID. Used in the lookup name rpc.
  ********************************************************************/
 
-BOOL lookup_local_name(char *domain, char *user, DOM_SID *psid, uint8 *psid_name_use)
+BOOL local_lookup_name(char *domain, char *user, DOM_SID *psid, enum SID_NAME_USE *psid_name_use)
 {
        extern DOM_SID global_sid_World_Domain;
        struct passwd *pass = NULL;
@@ -1031,9 +511,6 @@ BOOL lookup_local_name(char *domain, char *user, DOM_SID *psid, uint8 *psid_name
 
        sid_copy(&local_sid, &global_sam_sid);
 
-       if(!strequal(global_myname, domain) && !strequal(global_myworkgroup, domain))
-               return False;
-
        /*
         * Special case for MACHINE\Everyone. Map to the world_sid.
         */
@@ -1045,9 +522,15 @@ BOOL lookup_local_name(char *domain, char *user, DOM_SID *psid, uint8 *psid_name
                return True;
        }
 
+       /* 
+        * Don't lookup local unix users if running in appliance mode
+        */
+       if (lp_hide_local_users()) 
+               return False;
+
        (void)map_username(user);
 
-       if(!(pass = Get_Pwnam(user, False))) {
+       if(!(pass = sys_getpwnam(user))) {
                /*
                 * Maybe it was a group ?
                 */
@@ -1068,3 +551,1135 @@ BOOL lookup_local_name(char *domain, char *user, DOM_SID *psid, uint8 *psid_name
 
        return True;
 }
+
+/****************************************************************************
+ Convert a uid to SID - locally.
+****************************************************************************/
+DOM_SID *local_uid_to_sid(DOM_SID *psid, uid_t uid)
+{
+       extern DOM_SID global_sam_sid;
+
+       sid_copy(psid, &global_sam_sid);
+       sid_append_rid(psid, pdb_uid_to_user_rid(uid));
+
+       return psid;
+}
+
+
+/****************************************************************************
+ Convert a SID to uid - locally.
+****************************************************************************/
+BOOL local_sid_to_uid(uid_t *puid, DOM_SID *psid, enum SID_NAME_USE *name_type)
+{
+       extern DOM_SID global_sam_sid;
+
+       DOM_SID dom_sid;
+       uint32 rid;
+
+       *name_type = SID_NAME_UNKNOWN;
+
+       sid_copy(&dom_sid, psid);
+       sid_split_rid(&dom_sid, &rid);
+
+       /*
+        * We can only convert to a uid if this is our local
+        * Domain SID (ie. we are the controling authority).
+        */
+       if (!sid_equal(&global_sam_sid, &dom_sid))
+               return False;
+
+       *puid = pdb_user_rid_to_uid(rid);
+
+       /*
+        * Ensure this uid really does exist.
+        */
+       if(!sys_getpwuid(*puid))
+               return False;
+
+       return True;
+}
+
+/****************************************************************************
+ Convert a gid to SID - locally.
+****************************************************************************/
+DOM_SID *local_gid_to_sid(DOM_SID *psid, gid_t gid)
+{
+    extern DOM_SID global_sam_sid;
+
+       sid_copy(psid, &global_sam_sid);
+       sid_append_rid(psid, pdb_gid_to_group_rid(gid));
+
+       return psid;
+}
+
+/****************************************************************************
+ Convert a SID to gid - locally.
+****************************************************************************/
+BOOL local_sid_to_gid(gid_t *pgid, DOM_SID *psid, enum SID_NAME_USE *name_type)
+{
+    extern DOM_SID global_sam_sid;
+       DOM_SID dom_sid;
+       uint32 rid;
+
+       *name_type = SID_NAME_UNKNOWN;
+
+       sid_copy(&dom_sid, psid);
+       sid_split_rid(&dom_sid, &rid);
+
+       /*
+        * We can only convert to a gid if this is our local
+        * Domain SID (ie. we are the controling authority).
+        */
+
+       if (!sid_equal(&global_sam_sid, &dom_sid))
+               return False;
+
+       *pgid = pdb_user_rid_to_gid(rid);
+
+       /*
+        * Ensure this gid really does exist.
+        */
+
+       if(!getgrgid(*pgid))
+               return False;
+
+       return True;
+}
+
+static void select_name(fstring *string, char **name, const UNISTR2 *from)
+{
+       if (from->buffer != 0)
+       {
+               unistr2_to_ascii(*string, from, sizeof(*string));
+               *name = *string;
+       }
+}
+
+/*************************************************************
+ copies a SAM_USER_INFO_23 to a SAM_ACCOUNT
+ **************************************************************/
+void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
+{
+       static fstring smb_name;
+       static fstring full_name;
+       static fstring home_dir;
+       static fstring dir_drive;
+       static fstring logon_script;
+       static fstring profile_path;
+       static fstring acct_desc;
+       static fstring workstations;
+       static fstring unknown_str;
+       static fstring munged_dial;
+
+       if (from == NULL || to == NULL) 
+               return;
+
+       to->logon_time = nt_time_to_unix(&from->logon_time);
+       to->logoff_time = nt_time_to_unix(&from->logoff_time);
+       to->kickoff_time = nt_time_to_unix(&from->kickoff_time);
+       to->pass_last_set_time = nt_time_to_unix(&from->pass_last_set_time);
+       to->pass_can_change_time = nt_time_to_unix(&from->pass_can_change_time);
+       to->pass_must_change_time = nt_time_to_unix(&from->pass_must_change_time);
+
+       select_name(&smb_name    , &to->username    , &from->uni_user_name   );
+       select_name(&full_name   , &to->full_name   , &from->uni_full_name   );
+       select_name(&home_dir    , &to->home_dir    , &from->uni_home_dir    );
+       select_name(&dir_drive   , &to->dir_drive   , &from->uni_dir_drive   );
+       select_name(&logon_script, &to->logon_script, &from->uni_logon_script);
+       select_name(&profile_path, &to->profile_path, &from->uni_profile_path);
+       select_name(&acct_desc   , &to->acct_desc   , &from->uni_acct_desc   );
+       select_name(&workstations, &to->workstations, &from->uni_workstations);
+       select_name(&unknown_str , &to->unknown_str , &from->uni_unknown_str );
+       select_name(&munged_dial , &to->munged_dial , &from->uni_munged_dial );
+
+       to->user_rid = from->user_rid;
+       to->group_rid = from->group_rid;
+
+       to->acct_ctrl = from->acb_info;
+       to->unknown_3 = from->unknown_3;
+
+       to->logon_divs = from->logon_divs;
+       to->hours_len = from->logon_hrs.len;
+       memcpy(to->hours, from->logon_hrs.hours, MAX_HOURS_LEN);
+
+       to->unknown_5 = from->unknown_5;
+       to->unknown_6 = from->unknown_6;
+}
+
+/*************************************************************
+ copies a sam passwd.
+ **************************************************************/
+void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
+{
+       static fstring smb_name;
+       static fstring full_name;
+       static fstring home_dir;
+       static fstring dir_drive;
+       static fstring logon_script;
+       static fstring profile_path;
+       static fstring acct_desc;
+       static fstring workstations;
+       static fstring unknown_str;
+       static fstring munged_dial;
+
+       if (from == NULL || to == NULL) 
+               return;
+
+       to->logon_time = nt_time_to_unix(&from->logon_time);
+       to->logoff_time = nt_time_to_unix(&from->logoff_time);
+       to->kickoff_time = nt_time_to_unix(&from->kickoff_time);
+       to->pass_last_set_time = nt_time_to_unix(&from->pass_last_set_time);
+       to->pass_can_change_time = nt_time_to_unix(&from->pass_can_change_time);
+       to->pass_must_change_time = nt_time_to_unix(&from->pass_must_change_time);
+
+       select_name(&smb_name    , &to->username    , &from->uni_user_name   );
+       select_name(&full_name   , &to->full_name   , &from->uni_full_name   );
+       select_name(&home_dir    , &to->home_dir    , &from->uni_home_dir    );
+       select_name(&dir_drive   , &to->dir_drive   , &from->uni_dir_drive   );
+       select_name(&logon_script, &to->logon_script, &from->uni_logon_script);
+       select_name(&profile_path, &to->profile_path, &from->uni_profile_path);
+       select_name(&acct_desc   , &to->acct_desc   , &from->uni_acct_desc   );
+       select_name(&workstations, &to->workstations, &from->uni_workstations);
+       select_name(&unknown_str , &to->unknown_str , &from->uni_unknown_str );
+       select_name(&munged_dial , &to->munged_dial , &from->uni_munged_dial );
+
+       to->user_rid = from->user_rid;
+       to->group_rid = from->group_rid;
+       
+       /* FIXME!!  Do we need to copy the passwords here as well?
+          I don't know.  Need to figure this out   --jerry */
+
+       to->acct_ctrl = from->acb_info;
+       to->unknown_3 = from->unknown_3;
+
+       to->logon_divs = from->logon_divs;
+       to->hours_len = from->logon_hrs.len;
+       memcpy(to->hours, from->logon_hrs.hours, MAX_HOURS_LEN);
+
+       to->unknown_5 = from->unknown_5;
+       to->unknown_6 = from->unknown_6;
+}
+
+
+/*************************************************************
+ copies a sam passwd.
+ **************************************************************/
+void copy_sam_passwd(SAM_ACCOUNT *to, const SAM_ACCOUNT *from)
+{
+       static fstring smb_name="";
+       static fstring full_name="";
+       static fstring home_dir="";
+       static fstring dir_drive="";
+       static fstring logon_script="";
+       static fstring profile_path="";
+       static fstring acct_desc="";
+       static fstring workstations="";
+       static fstring unknown_str="";
+       static fstring munged_dial="";
+       static BYTE lm_pw[16], nt_pw[16];
+
+       if (from == NULL || to == NULL) 
+               return;
+
+       /* we won't own this memory so set the flag.
+          This will also clear the strings from 'to' */
+       pdb_set_mem_ownership (to, False);
+       
+       memcpy(to, from, sizeof(*from));
+
+       if (from->username != NULL) 
+       {
+               fstrcpy(smb_name , from->username);
+               to->username = smb_name;
+       }
+       
+       if (from->full_name != NULL) 
+       {
+               fstrcpy(full_name, from->full_name);
+               to->full_name = full_name;
+       }
+
+       if (from->home_dir != NULL) 
+       {
+               fstrcpy(home_dir, from->home_dir);
+               to->home_dir = home_dir;
+       }
+
+       if (from->dir_drive != NULL) 
+       {
+               fstrcpy(dir_drive  , from->dir_drive);
+               to->dir_drive = dir_drive;
+       }
+
+       if (from->logon_script != NULL) 
+       {
+               fstrcpy(logon_script  , from->logon_script);
+               to->logon_script = logon_script;
+       }
+
+       if (from->profile_path != NULL) 
+       {
+               fstrcpy(profile_path  , from->profile_path);
+               to->profile_path = profile_path;
+       }
+
+       if (from->acct_desc != NULL) 
+       {
+               fstrcpy(acct_desc  , from->acct_desc);
+               to->acct_desc = acct_desc;
+       }
+
+       if (from->workstations != NULL) 
+       {
+               fstrcpy(workstations  , from->workstations);
+               to->workstations = workstations;
+       }
+
+       if (from->unknown_str != NULL) 
+       {
+               fstrcpy(unknown_str  , from->unknown_str);
+               to->unknown_str = unknown_str;
+       }
+
+       if (from->munged_dial != NULL) 
+       {
+               fstrcpy(munged_dial  , from->munged_dial);
+               to->munged_dial = munged_dial;
+       }
+       
+       if (from->nt_pw != NULL)
+       {
+               memcpy (nt_pw, from->nt_pw, 16);
+               to->nt_pw = nt_pw;
+       }
+
+       if (from->lm_pw != NULL)
+       {
+               memcpy (lm_pw, from->lm_pw, 16);
+               to->lm_pw = lm_pw;
+       }
+
+       return;
+}
+
+/*************************************************************
+ change a password entry in the local smbpasswd file
+
+ FIXME!!  The function needs to be abstracted into the
+ passdb interface or something.  It is currently being called
+ by _api_samr_create_user() in rpc_server/srv_samr.c
+ --jerry
+ *************************************************************/
+
+BOOL local_password_change(char *user_name, int local_flags,
+                          char *new_passwd, 
+                          char *err_str, size_t err_str_len,
+                          char *msg_str, size_t msg_str_len)
+{
+       struct passwd  *pwd = NULL;
+       SAM_ACCOUNT     *sam_pass;
+       SAM_ACCOUNT     new_sam_acct;
+       uchar           new_p16[16];
+       uchar           new_nt_p16[16];
+
+       *err_str = '\0';
+       *msg_str = '\0';
+
+       if (local_flags & LOCAL_ADD_USER) {
+       
+               /*
+                * Check for a local account - if we're adding only.
+                */
+       
+               if(!(pwd = sys_getpwnam(user_name))) {
+                       slprintf(err_str, err_str_len - 1, "User %s does not \
+exist in system password file (usually /etc/passwd). Cannot add \
+account without a valid local system user.\n", user_name);
+                       return False;
+               }
+       }
+
+       /* Calculate the MD4 hash (NT compatible) of the new password. */
+       nt_lm_owf_gen(new_passwd, new_nt_p16, new_p16);
+
+       /* Get the smb passwd entry for this user */
+       sam_pass = pdb_getsampwnam(user_name);
+       if (sam_pass == NULL) 
+       {
+               if(!(local_flags & LOCAL_ADD_USER)) 
+               {
+                       slprintf(err_str, err_str_len-1,"Failed to find entry for user %s.\n", user_name);
+                       return False;
+               }
+
+               /* create the SAM_ACCOUNT struct and call pdb_add_sam_account.
+                  Because the new_sam_pwd only exists in the scope of this function
+                  we will not allocate memory for members */
+               pdb_init_sam          (&new_sam_acct);
+               pdb_set_mem_ownership (&new_sam_acct, False);
+               pdb_set_username      (&new_sam_acct, user_name);
+               pdb_set_fullname      (&new_sam_acct, pwd->pw_gecos);
+               pdb_set_uid           (&new_sam_acct, pwd->pw_uid);
+               pdb_set_gid           (&new_sam_acct, pwd->pw_gid);
+               pdb_set_pass_last_set_time(&new_sam_acct, time(NULL));
+               pdb_set_profile_path  (&new_sam_acct, lp_logon_path());
+               pdb_set_homedir       (&new_sam_acct, lp_logon_home());
+               pdb_set_dir_drive     (&new_sam_acct, lp_logon_drive());
+               pdb_set_logon_script  (&new_sam_acct, lp_logon_script());
+
+               /* set account flags */
+               pdb_set_acct_ctrl(&new_sam_acct,((local_flags & LOCAL_TRUST_ACCOUNT) ? ACB_WSTRUST : ACB_NORMAL) );
+               if (local_flags & LOCAL_DISABLE_USER)
+               {
+                       pdb_set_acct_ctrl (&new_sam_acct, pdb_get_acct_ctrl(&new_sam_acct)|ACB_DISABLED);
+               }
+               if (local_flags & LOCAL_SET_NO_PASSWORD)
+               {
+                       pdb_set_acct_ctrl (&new_sam_acct, pdb_get_acct_ctrl(&new_sam_acct)|ACB_PWNOTREQ);
+               }
+               else
+               {
+                       /* set the passwords here.  if we get to here it means
+                          we have a valid, active account */
+                       pdb_set_lanman_passwd (&new_sam_acct, new_p16);
+                       pdb_set_nt_passwd     (&new_sam_acct, new_nt_p16);
+               }
+               
+                       
+               if (pdb_add_sam_account(&new_sam_acct)) 
+               {
+                       slprintf(msg_str, msg_str_len-1, "Added user %s.\n", user_name);
+                       pdb_clear_sam (&new_sam_acct);
+                       return True;
+               } 
+               else 
+               {
+                       slprintf(err_str, err_str_len-1, "Failed to add entry for user %s.\n", user_name);
+                       return False;
+               }
+       } 
+       else 
+       {
+               /* the entry already existed */
+               local_flags &= ~LOCAL_ADD_USER;
+       }
+
+       /*
+        * We are root - just write the new password
+        * and the valid last change time.
+        */
+
+       if(local_flags & LOCAL_DISABLE_USER) 
+       {
+               pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_DISABLED);
+       }
+       else if (local_flags & LOCAL_ENABLE_USER) 
+       {
+               if(pdb_get_lanman_passwd(sam_pass) == NULL) 
+               {
+                       pdb_set_lanman_passwd (sam_pass, new_p16);
+                       pdb_set_nt_passwd     (sam_pass, new_nt_p16);
+               }
+               pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED));
+       } else if (local_flags & LOCAL_SET_NO_PASSWORD) 
+       {
+               pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_PWNOTREQ);
+               
+               /* This is needed to preserve ACB_PWNOTREQ in mod_smbfilepwd_entry */
+               pdb_set_lanman_passwd (sam_pass, NULL);
+               pdb_set_nt_passwd     (sam_pass, NULL);
+       } 
+       else 
+       {
+               /*
+                * If we're dealing with setting a completely empty user account
+                * ie. One with a password of 'XXXX', but not set disabled (like
+                * an account created from scratch) then if the old password was
+                * 'XX's then getsmbpwent will have set the ACB_DISABLED flag.
+                * We remove that as we're giving this user their first password
+                * and the decision hasn't really been made to disable them (ie.
+                * don't create them disabled). JRA.
+                */
+               if ((pdb_get_lanman_passwd(sam_pass)==NULL) && (pdb_get_acct_ctrl(sam_pass)&ACB_DISABLED))
+                       pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED));
+               pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_PWNOTREQ));
+               pdb_set_lanman_passwd (sam_pass, new_p16);
+               pdb_set_nt_passwd     (sam_pass, new_nt_p16);
+       }
+       
+       if(local_flags & LOCAL_DELETE_USER) 
+       {
+               if (!pdb_delete_sam_account(user_name)) 
+               {
+                       slprintf(err_str,err_str_len-1, "Failed to delete entry for user %s.\n", user_name);
+                       return False;
+               }
+               slprintf(msg_str, msg_str_len-1, "Deleted user %s.\n", user_name);
+       } 
+       else 
+       {
+               if(!pdb_update_sam_account(sam_pass, True)) 
+               {
+                       slprintf(err_str, err_str_len-1, "Failed to modify entry for user %s.\n", user_name);
+                       return False;
+               }
+               if(local_flags & LOCAL_DISABLE_USER)
+                       slprintf(msg_str, msg_str_len-1, "Disabled user %s.\n", user_name);
+               else if (local_flags & LOCAL_ENABLE_USER)
+                       slprintf(msg_str, msg_str_len-1, "Enabled user %s.\n", user_name);
+               else if (local_flags & LOCAL_SET_NO_PASSWORD)
+                       slprintf(msg_str, msg_str_len-1, "User %s password set to none.\n", user_name);
+       }
+
+       return True;
+}
+
+
+/*********************************************************************
+ collection of get...() functions for SAM_ACCOUNT_INFO
+ ********************************************************************/
+uint16 pdb_get_acct_ctrl (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->acct_ctrl);
+       else
+               return (ACB_DISABLED);
+}
+
+time_t pdb_get_logon_time (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->logon_time);
+       else
+               return (0);
+}
+
+time_t pdb_get_logoff_time (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->logoff_time);
+       else
+               return (-1);
+}
+
+time_t pdb_get_kickoff_time (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->kickoff_time);
+       else
+               return (-1);
+}
+
+time_t pdb_get_pass_last_set_time (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->pass_last_set_time);
+       else
+               return (-1);
+}
+
+time_t pdb_get_pass_can_change_time (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->pass_can_change_time);
+       else
+               return (-1);
+}
+
+time_t pdb_get_pass_must_change_time (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->pass_must_change_time);
+       else
+               return (-1);
+}
+
+uint16 pdb_get_logon_divs (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->logon_divs);
+       else
+               return (-1);
+}
+
+uint32 pdb_get_hours_len (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->hours_len);
+       else
+               return (-1);
+}
+
+uint8* pdb_get_hours (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->hours);
+       else
+               return (NULL);
+}
+
+BYTE* pdb_get_nt_passwd (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->nt_pw);
+       else
+               return (NULL);
+}
+
+BYTE* pdb_get_lanman_passwd (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->lm_pw);
+       else
+               return (NULL);
+}
+
+
+uint32 pdb_get_user_rid (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->user_rid);
+       else
+               return (-1);
+}
+
+uint32 pdb_get_group_rid (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->group_rid);
+       else
+               return (-1);
+}
+
+uid_t pdb_get_uid (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->uid);
+       else
+               return ((uid_t)-1);
+}
+
+gid_t pdb_get_gid (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->gid);
+       else
+               return ((gid_t)-1);
+}
+
+char* pdb_get_username (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->username);
+       else
+               return (NULL);
+}
+
+char* pdb_get_domain (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->domain);
+       else
+               return (NULL);
+}
+
+char* pdb_get_nt_username (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->nt_username);
+       else
+               return (NULL);
+}
+
+char* pdb_get_fullname (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->full_name);
+       else
+               return (NULL);
+}
+
+char* pdb_get_homedir (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->home_dir);
+       else
+               return (NULL);
+}
+
+char* pdb_get_dirdrive (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->dir_drive);
+       else
+               return (NULL);
+}
+
+char* pdb_get_logon_script (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->logon_script);
+       else
+               return (NULL);
+}
+
+char* pdb_get_profile_path (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->profile_path);
+       else
+               return (NULL);
+}
+
+char* pdb_get_acct_desc (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->acct_desc);
+       else
+               return (NULL);
+}
+
+char* pdb_get_workstations (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->workstations);
+       else
+               return (NULL);
+}
+
+char* pdb_get_munged_dial (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->munged_dial);
+       else
+               return (NULL);
+}
+
+uint32 pdb_get_unknown3 (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->unknown_3);
+       else
+               return (-1);
+}
+
+uint32 pdb_get_unknown5 (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->unknown_5);
+       else
+               return (-1);
+}
+
+uint32 pdb_get_unknown6 (SAM_ACCOUNT *sampass)
+{
+       if (sampass)
+               return (sampass->unknown_6);
+       else
+               return (-1);
+}
+
+/*********************************************************************
+ collection of set...() functions for SAM_ACCOUNT_INFO
+ ********************************************************************/
+
+/********************************************************************
+ The purpose of this flag is to determine whether or not we 
+ should free the memory when we are done.  This allows us to
+ use local static variables for string (reduce the number of
+ malloc() calls) while still allowing for flexibility of 
+ dynamic objects.
+ We always clear the structure even if setting the flag to the
+ same value.
+ *******************************************************************/
+void pdb_set_mem_ownership (SAM_ACCOUNT *sampass, BOOL flag)
+{
+       /* if we have no SAM_ACCOUNT struct or no change, then done */
+       if (sampass == NULL)
+               return;
+
+       /* clear the struct and set the ownership flag */
+       pdb_clear_sam (sampass);
+       sampass->own_memory = flag;
+
+       return;
+}
+
+BOOL pdb_set_acct_ctrl (SAM_ACCOUNT *sampass, uint16 flags)
+{
+       if (!sampass)
+               return False;
+               
+       if (sampass)
+       {
+               sampass->acct_ctrl = flags;
+               return True;
+       }
+       
+       return False;
+}
+
+BOOL pdb_set_logon_time (SAM_ACCOUNT *sampass, time_t mytime)
+{
+       if (!sampass)
+               return False;
+
+       sampass->logon_time = mytime;
+       return True;
+}
+
+BOOL pdb_set_logoff_time (SAM_ACCOUNT *sampass, time_t mytime)
+{
+       if (!sampass)
+               return False;
+
+       sampass->logoff_time = mytime;
+       return True;
+}
+
+BOOL pdb_set_kickoff_time (SAM_ACCOUNT *sampass, time_t mytime)
+{
+       if (!sampass)
+               return False;
+
+       sampass->kickoff_time = mytime;
+       return True;
+}
+
+BOOL pdb_set_pass_can_change_time (SAM_ACCOUNT *sampass, time_t mytime)
+{
+       if (!sampass)
+               return False;
+
+       sampass->pass_can_change_time = mytime;
+       return True;
+}
+
+BOOL pdb_set_pass_must_change_time (SAM_ACCOUNT *sampass, time_t mytime)
+{
+       if (!sampass)
+               return False;
+
+       sampass->pass_must_change_time = mytime;
+       return True;
+}
+
+BOOL pdb_set_pass_last_set_time (SAM_ACCOUNT *sampass, time_t mytime)
+{
+       if (!sampass)
+               return False;
+
+       sampass->pass_last_set_time = mytime;
+       return True;
+}
+
+BOOL pdb_set_hours_len (SAM_ACCOUNT *sampass, uint32 len)
+{
+       if (!sampass)
+               return False;
+
+       sampass->hours_len = len;
+       return True;
+}
+
+BOOL pdb_set_logons_divs (SAM_ACCOUNT *sampass, uint16 hours)
+{
+       if (!sampass)
+               return False;
+
+       sampass->logon_divs = hours;
+       return True;
+}
+
+BOOL pdb_set_uid (SAM_ACCOUNT *sampass, uid_t uid)
+{
+       if (!sampass)
+               return False;
+
+       sampass->uid = uid;
+       return True;
+}
+
+BOOL pdb_set_gid (SAM_ACCOUNT *sampass, gid_t gid)
+{
+       if (!sampass)
+               return False;
+
+       sampass->gid = gid;
+       return True;
+}
+
+BOOL pdb_set_user_rid (SAM_ACCOUNT *sampass, uint32 rid)
+{
+       if (!sampass)
+               return False;
+
+       sampass->user_rid = rid;
+       return True;
+}
+
+BOOL pdb_set_group_rid (SAM_ACCOUNT *sampass, uint32 grid)
+{
+       if (!sampass)
+               return False;
+
+       sampass->group_rid = grid;
+       return True;
+}
+
+BOOL pdb_set_username (SAM_ACCOUNT *sampass, char *username)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->username = username;
+       else
+       {
+               if ( (sampass->username=strdup(username)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_username: ERROR - Unable to malloc memory for [%s]\n", username));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_domain (SAM_ACCOUNT *sampass, char *domain)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->domain = domain;
+       else
+       {
+               if ( (sampass->domain=strdup(domain)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_domain: ERROR - Unable to malloc memory for [%s]\n", domain));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_nt_username (SAM_ACCOUNT *sampass, char *nt_username)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->nt_username = nt_username;
+       else
+       {
+               if ( (sampass->nt_username=strdup(nt_username)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_nt_username: ERROR - Unable to malloc memory for [%s]\n", nt_username));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_fullname (SAM_ACCOUNT *sampass, char *fullname)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->full_name = fullname;
+       else
+       {
+               if ( (sampass->full_name=strdup(fullname)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_fullname: ERROR - Unable to malloc memory for [%s]\n", fullname));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_logon_script (SAM_ACCOUNT *sampass, char *logon_script)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->logon_script = logon_script;
+       else
+       {
+               if ( (sampass->logon_script=strdup(logon_script)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_logon_script: ERROR - Unable to malloc memory for [%s]\n", logon_script));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_profile_path (SAM_ACCOUNT *sampass, char *profile_path)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->profile_path = profile_path;
+       else
+       {
+               if ( (sampass->profile_path=strdup(profile_path)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_profile_path: ERROR - Unable to malloc memory for [%s]\n", profile_path));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_dir_drive (SAM_ACCOUNT *sampass, char *dir_drive)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->dir_drive = dir_drive;
+       else
+       {
+               if ( (sampass->dir_drive=strdup(dir_drive)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_dir_drive: ERROR - Unable to malloc memory for [%s]\n", dir_drive));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_homedir (SAM_ACCOUNT *sampass, char *homedir)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->home_dir = homedir;
+       else
+       {
+               if ( (sampass->home_dir=strdup(homedir)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_home_dir: ERROR - Unable to malloc memory for [%s]\n", homedir));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_acct_desc (SAM_ACCOUNT *sampass, char *acct_desc)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->acct_desc = acct_desc;
+       else
+       {
+               if ( (sampass->acct_desc=strdup(acct_desc)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_acct_desc: ERROR - Unable to malloc memory for [%s]\n", acct_desc));
+                       return False;
+               }
+       }
+
+       return True;
+}
+BOOL pdb_set_workstations (SAM_ACCOUNT *sampass, char *workstations)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->workstations = workstations;
+       else
+       {
+               if ( (sampass->workstations=strdup(workstations)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_workstations: ERROR - Unable to malloc memory for [%s]\n", workstations));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_munged_dial (SAM_ACCOUNT *sampass, char *munged_dial)
+{
+       if (!sampass)
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->munged_dial = munged_dial;
+       else
+       {
+               if ( (sampass->munged_dial=strdup(munged_dial)) == NULL )
+               {
+                       DEBUG (0,("pdb_set_munged_dial: ERROR - Unable to malloc memory for [%s]\n", munged_dial));
+                       return False;
+               }
+       }
+
+       return True;
+}
+
+BOOL pdb_set_nt_passwd (SAM_ACCOUNT *sampass, BYTE *pwd)
+{
+       if ( (!sampass) ||(pwd == NULL) )
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->nt_pw = pwd;
+       else
+       {
+               if ((sampass->nt_pw=(BYTE*)malloc(sizeof(BYTE)*16)) == NULL)
+               {
+                       DEBUG(0,("pdb_set_nt_passwd: ERROR - out of memory for nt_pw!\n"));
+                       return False;
+               }
+               if (!memcpy(sampass->nt_pw, pwd, 16))
+                       return False;
+       }       
+
+       return True;
+}
+
+BOOL pdb_set_lanman_passwd (SAM_ACCOUNT *sampass, BYTE *pwd)
+{
+       if ( (!sampass) ||(pwd == NULL) )
+               return False;
+
+       if (!sampass->own_memory)
+               sampass->lm_pw = pwd;
+       else
+       {
+               if ((sampass->lm_pw=(BYTE*)malloc(sizeof(BYTE)*16)) == NULL)
+               {
+                       DEBUG(0,("pdb_set_lanman_passwd: ERROR - out of memory for lm_pw!\n"));
+                       return False;
+               }
+               if (!memcpy(sampass->lm_pw, pwd, 16))
+                       return False;
+       }       
+
+       return True;
+}
+
+
+
+
+