Move all the pdb_get...() and pdb_set...() functions to a new file.
[ira/wip.git] / source3 / passdb / passdb.c
index c0a20f34204c3bc7b3814bd5fa1acc2fe445f89c..1dd0d4141acd2b5849789c0d514a74cd2e560bd0 100644 (file)
@@ -1,9 +1,11 @@
 /* 
    Unix SMB/Netbios implementation.
-   Version 1.9.
+   Version 3.0
    Password and authentication handling
-   Copyright (C) Jeremy Allison 1996-1998
-   Copyright (C) Luke Kenneth Casson Leighton 1996-1998
+   Copyright (C) Jeremy Allison                1996-2001
+   Copyright (C) Luke Kenneth Casson Leighton  1996-1998
+   Copyright (C) Gerald (Jerry) Carter         2000-2001
+   Copyright (C) Andrew Bartlett               2001-2002
       
    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
@@ -21,9 +23,6 @@
 */
 
 #include "includes.h"
-#include "nterr.h"
-
-extern int DEBUGLEVEL;
 
 /*
  * This is set on startup - it defines the SID for this
@@ -32,487 +31,227 @@ 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;
+#if 0  /* JERRY */
+static void* pdb_handle = NULL;
+#endif
 
 /***************************************************************
  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);
+BOOL initialize_password_db(BOOL reload)
+{      
+       /* 
+        * This function is unfinished right now, so just 
+        * ignore the details and always return True.  It 
+        * is here only as a placeholder          --jerry 
+        */
+       return True;
+       
 }
 
-/*
- * 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));
-}
+/************************************************************
+ Fill the SAM_ACCOUNT with default values.
+ ***********************************************************/
 
-/************************************************************************
- 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)
+static BOOL pdb_fill_default_sam(SAM_ACCOUNT *user)
 {
-       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));
+       if (user == NULL) {
+               DEBUG(0,("pdb_fill_default_sam: SAM_ACCOUNT was NULL\n"));
+               return False;
        }
+       
+       ZERO_STRUCTP(user);
+
+        /* Don't change these timestamp settings without a good reason.
+           They are important for NT member server compatibility. */
+
+       user->private.init_flag             = FLAG_SAM_UNINIT;
+       user->private.uid = user->private.gid       = -1;
+
+       user->private.logon_time            = (time_t)0;
+       user->private.pass_last_set_time    = (time_t)0;
+       user->private.pass_can_change_time  = (time_t)0;
+       user->private.logoff_time           = 
+       user->private.kickoff_time          = 
+       user->private.pass_must_change_time = get_time_t_max();
+       user->private.unknown_3 = 0x00ffffff;   /* don't know */
+       user->private.logon_divs = 168;         /* hours per week */
+       user->private.hours_len = 21;           /* 21 times 8 bits = 168 */
+       memset(user->private.hours, 0xff, user->private.hours_len); /* available at all hours */
+       user->private.unknown_5 = 0x00000000; /* don't know */
+       user->private.unknown_6 = 0x000004ec; /* don't know */
+       return True;
+}      
 
-       endsmbpwent(fp);
-       return pwd;
-}
 
-/************************************************************************
- Utility function to search smb passwd by name.  use this if your database
- does not have search facilities.
-*************************************************************************/
+/*************************************************************
+ Alloc memory and initialises a struct sam_passwd.
+ ************************************************************/
 
-struct smb_passwd *iterate_getsmbpwnam(char *name)
+BOOL pdb_init_sam(SAM_ACCOUNT **user)
 {
-       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;
+       if (*user != NULL) {
+               DEBUG(0,("pdb_init_sam: SAM_ACCOUNT was non NULL\n"));
+#if 0
+               smb_panic("NULL pointer passed to pdb_init_sam\n");
+#endif
+               return False;
        }
+       
+       *user=(SAM_ACCOUNT *)malloc(sizeof(SAM_ACCOUNT));
 
-       while ((pwd = getsmbpwent(fp)) != NULL && !strequal(pwd->smb_name, name))
-      ;
-
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by name: %s\n", name));
+       if (*user==NULL) {
+               DEBUG(0,("pdb_init_sam: error while allocating memory\n"));
+               return False;
        }
 
-       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.
+       pdb_fill_default_sam(*user);
 
-****************************************************************/
-
-void endsmbpwent(void *vp)
-{
-  pdb_ops->endsmbpwent(vp);
+       return True;
 }
 
-/*************************************************************************
- 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.
-*************************************************************************/
+/*************************************************************
Initialises a struct sam_passwd with sane values.
+ ************************************************************/
 
-BOOL add_smbpwd_entry(struct smb_passwd *newpwd)
+BOOL pdb_init_sam_pw(SAM_ACCOUNT **new_sam_acct, const struct passwd *pwd)
 {
-       return pdb_ops->add_smbpwd_entry(newpwd);
-}
+       pstring str;
+       GROUP_MAP map;
+       uint32 rid;
 
-/************************************************************************
- 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);
-}
+       if (!pwd) {
+               new_sam_acct = NULL;
+               return False;
+       }
 
-/************************************************************************
- Routine to search smb passwd by name.
-*************************************************************************/
+       if (!pdb_init_sam(new_sam_acct)) {
+               new_sam_acct = NULL;
+               return False;
+       }
 
-struct smb_passwd *getsmbpwnam(char *name)
-{
-       return pdb_ops->getsmbpwnam(name);
-}
+       pdb_set_username(*new_sam_acct, pwd->pw_name);
+       pdb_set_fullname(*new_sam_acct, pwd->pw_gecos);
 
-/************************************************************************
- Routine to search smb passwd by user rid.
-*************************************************************************/
+       pdb_set_uid(*new_sam_acct, pwd->pw_uid);
+       pdb_set_gid(*new_sam_acct, pwd->pw_gid);
+       
+       pdb_set_user_rid(*new_sam_acct, pdb_uid_to_user_rid(pwd->pw_uid));
 
-struct smb_passwd *getsmbpwrid(uint32 user_rid)
-{
-       return pdb_ops->getsmbpwrid(user_rid);
-}
+       /* call the mapping code here */
+       if(get_group_map_from_gid(pwd->pw_gid, &map, MAPPING_WITHOUT_PRIV)) {
+               sid_peek_rid(&map.sid, &rid);
+       } 
+       else {
+               rid=pdb_gid_to_group_rid(pwd->pw_gid);
+       }
+               
+       pdb_set_group_rid(*new_sam_acct, rid);
 
-/************************************************************************
- Routine to search smb passwd by uid.
-*************************************************************************/
+       pstrcpy(str, lp_logon_path());
+       standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+       pdb_set_profile_path(*new_sam_acct, str, False);
+       
+       pstrcpy(str, lp_logon_home());
+       standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+       pdb_set_homedir(*new_sam_acct, str, False);
+       
+       pstrcpy(str, lp_logon_drive());
+       standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+       pdb_set_dir_drive(*new_sam_acct, str, False);
 
-struct smb_passwd *getsmbpwuid(uid_t smb_userid)
-{
-       return pdb_ops->getsmbpwuid(smb_userid);
+       pstrcpy(str, lp_logon_script());
+       standard_sub_advanced(-1, pwd->pw_name, "", pwd->pw_gid, pwd->pw_name, str);
+       pdb_set_logon_script(*new_sam_acct, str, False);
+       
+       return True;
 }
 
-/*
- * 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.
-*************************************************************************/
+/**
+ * Free the contets of the SAM_ACCOUNT, but not the structure.
+ *
+ * Also wipes the LM and NT hashes from memory.
+ *
+ * @param user SAM_ACCOUNT to free members of.
+ **/
 
-struct sam_passwd *iterate_getsam21pwnam(char *name)
+static BOOL pdb_free_sam_contents(SAM_ACCOUNT *user)
 {
-       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;
+       if (user == NULL) {
+               DEBUG(0,("pdb_free_sam_contents: SAM_ACCOUNT was NULL\n"));
+#if 0
+               smb_panic("NULL pointer passed to pdb_free_sam_contents\n");
+#endif
+               return False;
        }
 
-       while ((pwd = getsam21pwent(fp)) != NULL && !strequal(pwd->smb_name, name))
-       {
-               DEBUG(10, ("iterate: %s 0x%x\n", pwd->smb_name, pwd->user_rid));
-       }
+       /* As we start mallocing more strings this is where  
+          we should free them. */
 
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by name: %s\n", name));
-       }
+       data_blob_clear_free(&(user->private.lm_pw));
+       data_blob_clear_free(&(user->private.nt_pw));
 
-       endsmbpwent(fp);
-       return pwd;
+       return True;    
 }
 
-/************************************************************************
- 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.  
+/************************************************************
+ Reset the SAM_ACCOUNT and free the NT/LM hashes.
+ ***********************************************************/
 
-*************************************************************************/
-
-struct sam_passwd *iterate_getsam21pwrid(uint32 rid)
+BOOL pdb_reset_sam(SAM_ACCOUNT *user)
 {
-       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;
+       if (user == NULL) {
+               DEBUG(0,("pdb_reset_sam: SAM_ACCOUNT was NULL\n"));
+#if 0
+               smb_panic("NULL pointer passed to pdb_free_sam\n");
+#endif
+               return False;
        }
-
-       while ((pwd = getsam21pwent(fp)) != NULL && pwd->user_rid != rid)
-       {
-               DEBUG(10, ("iterate: %s 0x%x\n", pwd->smb_name, pwd->user_rid));
+       
+       if (!pdb_free_sam_contents(user)) {
+               return False;
        }
 
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by user_rid: %x\n", rid));
+       if (!pdb_fill_default_sam(user)) {
+               return False;
        }
 
-       endsmbpwent(fp);
-       return pwd;
+       return True;
 }
 
-/************************************************************************
- 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.  
+/************************************************************
+ Free the SAM_ACCOUNT and the member pointers.
+ ***********************************************************/
 
-*************************************************************************/
-
-struct sam_passwd *iterate_getsam21pwuid(uid_t uid)
+BOOL pdb_free_sam(SAM_ACCOUNT **user)
 {
-       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)
-       {
-               DEBUG(0, ("unable to open sam password database.\n"));
-               return NULL;
+       if (*user == NULL) {
+               DEBUG(0,("pdb_free_sam: SAM_ACCOUNT was NULL\n"));
+#if 0
+               smb_panic("NULL pointer passed to pdb_free_sam\n");
+#endif
+               return False;
        }
 
-       while ((pwd = getsam21pwent(fp)) != NULL && pwd->smb_userid != uid)
-      ;
-
-       if (pwd != NULL)
-       {
-               DEBUG(10, ("found by smb_userid: %x\n", (int)uid));
+       if (!pdb_free_sam_contents(*user)) {
+               return False;
        }
 
-       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);
-}
-
-
-/**********************************************************
- **********************************************************
-
- 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;
-}
-
-/*************************************************************
- initialises a struct sam_passwd.
- **************************************************************/
-void pdb_init_sam(struct sam_passwd *user)
-{
-       if (user == NULL) return;
-       memset((char *)user, '\0', sizeof(*user));
-       user->logon_time            = (time_t)-1;
-       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;
-}
-
-/*************************************************************************
- Routine to return the next entry in the sam passwd list.
- *************************************************************************/
-
-struct sam_disp_info *pdb_sam_to_dispinfo(struct sam_passwd *user)
-{
-       static struct sam_disp_info disp_info;
-
-       if (user == NULL) return NULL;
-
-       pdb_init_dispinfo(&disp_info);
-
-       disp_info.smb_name  = user->smb_name;
-       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;
+       SAFE_FREE(*user);
+       
+       return True;    
 }
 
 
-/*************************************************************
- 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
@@ -521,38 +260,35 @@ struct sam_passwd *pdb_smb_to_sam(struct smb_passwd *user)
 
 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;
 }     
 
 /**********************************************************
  Decode the account control bits from a string.
-
- this function breaks coding standards minimum line width of 80 chars.
- reason: vertical line-up code clarity - all case statements fit into
- 15 lines, which is more important.
  **********************************************************/
 
 uint16 pdb_decode_acct_ctrl(const char *p)
@@ -565,12 +301,11 @@ uint16 pdb_decode_acct_ctrl(const char *p)
         * NT password (in the form [NDHTUWSLXI]).
         */
 
-       if (*p != '[') return 0;
+       if (*p != '[')
+               return 0;
 
-       for (p++; *p && !finished; p++)
-       {
-               switch (*p)
-               {
+       for (p++; *p && !finished; p++) {
+               switch (*p) {
                        case 'N': { acct_ctrl |= ACB_PWNOTREQ ; break; /* 'N'o password. */ }
                        case 'D': { acct_ctrl |= ACB_DISABLED ; break; /* 'D'isabled. */ }
                        case 'H': { acct_ctrl |= ACB_HOMDIRREQ; break; /* 'H'omedir required. */ }
@@ -594,140 +329,40 @@ uint16 pdb_decode_acct_ctrl(const char *p)
        return acct_ctrl;
 }
 
-/*******************************************************************
- gets password-database-format time from a string.
- ********************************************************************/
-
-static time_t get_time_from_string(const char *p)
-{
-       int i;
-
-       for (i = 0; i < 8; i++)
-       {
-               if (p[i] == '\0' || !isxdigit((int)(p[i]&0xFF)))
-               break;
-       }
-       if (i == 8)
-       {
-               /*
-                * 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)
+
+void pdb_sethexpwd(char *p, const unsigned char *pwd, uint16 acct_ctrl)
 {
-       if (pwd != NULL)
-       {
+       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))
-               {
+       } else {
+               if (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)
+
+BOOL pdb_gethexpwd(const char *p, unsigned char *pwd)
 {
        int i;
        unsigned char   lonybble, hinybble;
        char           *hexchars = "0123456789ABCDEF";
        char           *p1, *p2;
-
-       for (i = 0; i < 32; i += 2)
-       {
+       
+       if (!p)
+               return (False);
+       
+       for (i = 0; i < 32; i += 2) {
                hinybble = toupper(p[i]);
                lonybble = toupper(p[i + 1]);
 
@@ -735,9 +370,7 @@ BOOL pdb_gethexpwd(char *p, unsigned char *pwd)
                p2 = strchr(hexchars, lonybble);
 
                if (!p1 || !p2)
-               {
                        return (False);
-               }
 
                hinybble = PTR_DIFF(p1, hexchars);
                lonybble = PTR_DIFF(p2, hexchars);
@@ -751,290 +384,50 @@ 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)
+BOOL pdb_name_to_rid(const char *user_name, uint32 *u_rid, uint32 *g_rid)
 {
-    struct passwd *pw = Get_Pwnam(user_name, False);
+       GROUP_MAP map;
+       struct passwd *pw = Get_Pwnam(user_name);
 
        if (u_rid == NULL || g_rid == NULL || user_name == NULL)
-       {
                return False;
-       }
 
-       if (!pw)
-       {
+       if (!pw) {
                DEBUG(1,("Username %s is invalid on this system\n", user_name));
                return False;
        }
 
-       if (user_in_list(user_name, lp_domain_guest_users()))
-       {
-               *u_rid = DOMAIN_USER_RID_GUEST;
-       }
-       else if (user_in_list(user_name, lp_domain_admin_users()))
-       {
-               *u_rid = DOMAIN_USER_RID_ADMIN;
-       }
-       else
-       {
-               /* turn the unix UID into a Domain RID.  this is what the posix
-                  sub-system does (adds 1000 to the uid) */
-               *u_rid = pdb_uid_to_user_rid(pw->pw_uid);
-       }
+       /* turn the unix UID into a Domain RID.  this is what the posix
+          sub-system does (adds 1000 to the uid) */
+       *u_rid = pdb_uid_to_user_rid(pw->pw_uid);
 
        /* absolutely no idea what to do about the unix GID to Domain RID mapping */
-       *g_rid = pdb_gid_to_group_rid(pw->pw_gid);
+       /* map it ! */
+       if (get_group_map_from_gid(pw->pw_gid, &map, MAPPING_WITHOUT_PRIV)) {
+               sid_peek_rid(&map.sid, g_rid);
+       } else 
+               *g_rid = pdb_gid_to_group_rid(pw->pw_gid);
 
        return True;
 }
 
-/****************************************************************************
- Read the machine SID from a file.
-****************************************************************************/
-
-static BOOL read_sid_from_file(int fd, char *sid_file)
-{   
-  fstring fline;
-    
-  memset(fline, '\0', sizeof(fline));
+/*******************************************************************
+ Converts NT user RID to a UNIX uid.
+ ********************************************************************/
 
-  if(read(fd, fline, sizeof(fline) -1 ) < 0) {
-    DEBUG(0,("unable to read file %s. Error was %s\n",
-           sid_file, strerror(errno) ));
-    return False;
-  }
+uid_t pdb_user_rid_to_uid(uint32 user_rid)
+{
+       return (uid_t)(((user_rid & (~USER_RID_TYPE))- 1000)/RID_MULTIPLIER);
+}
 
-  /*
-   * Convert to the machine SID.
-   */
 
-  fline[sizeof(fline)-1] = '\0';
-  if(!string_to_sid( &global_sam_sid, fline)) {
-    DEBUG(0,("unable to generate machine SID.\n"));
-    return False;
-  }
+/*******************************************************************
+ Converts NT group RID to a UNIX gid.
+ ********************************************************************/
 
-  return True;
-}
-
-/****************************************************************************
- Generate the global machine sid. Look for the MACHINE.SID file first, if
- not found then look in smb.conf and use it to create the MACHINE.SID file.
-****************************************************************************/
-BOOL pdb_generate_sam_sid(void)
-{
-       int fd;
-       char *p;
-       pstring sid_file;
-       fstring sid_string;
-       SMB_STRUCT_STAT st;
-       BOOL overwrite_bad_sid = False;
-
-       generate_wellknown_sids();
-
-       pstrcpy(sid_file, lp_smb_passwd_file());
-       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;
-               }
-       }
-
-       pstrcat(sid_file, "MACHINE.SID");
-    
-       if((fd = sys_open(sid_file, O_RDWR | O_CREAT, 0644)) == -1) {
-               DEBUG(0,("unable to open or create file %s. Error was %s\n",
-                        sid_file, strerror(errno) ));
-               return False;
-       } 
-  
-       /*
-        * Check if the file contains data.
-        */
-       
-       if(sys_fstat( fd, &st) < 0) {
-               DEBUG(0,("unable to stat file %s. Error was %s\n",
-                        sid_file, strerror(errno) ));
-               close(fd);
-               return False;
-       } 
-  
-       if(st.st_size > 0) {
-               /*
-                * We have a valid SID - read it.
-                */
-               if(!read_sid_from_file( fd, sid_file)) {
-                       DEBUG(0,("unable to read file %s. Error was %s\n",
-                                sid_file, strerror(errno) ));
-                       close(fd);
-                       return False;
-               }
-
-               /*
-                * JRA. Reversed the sense of this test now that I have
-                * actually done this test *personally*. One more reason
-                * to never trust third party information you have not
-                * independently verified.... sigh. JRA.
-                */
-
-               if(global_sam_sid.num_auths > 0 && global_sam_sid.sub_auths[0] == 0x21) {
-                       /*
-                        * Fix and re-write...
-                        */
-                       overwrite_bad_sid = True;
-                       global_sam_sid.sub_auths[0] = 21;
-                       DEBUG(5,("pdb_generate_sam_sid: Old (incorrect) sid id_auth of hex 21 \
-detected - re-writing to be decimal 21 instead.\n" ));
-                       sid_to_string(sid_string, &global_sam_sid);
-                       if(sys_lseek(fd, (SMB_OFF_T)0, SEEK_SET) != 0) {
-                               DEBUG(0,("unable to seek file file %s. Error was %s\n",
-                                        sid_file, strerror(errno) ));
-                               close(fd);
-                               return False;
-                       }
-               } else {
-                       close(fd);
-                       return True;
-               }
-       } else {
-               /*
-                * The file contains no data - we need to generate our
-                * own sid.
-                * Generate the new sid data & turn it into a string.
-                */
-               int i;
-               uchar raw_sid_data[12];
-               DOM_SID mysid;
-
-               memset((char *)&mysid, '\0', sizeof(DOM_SID));
-               mysid.sid_rev_num = 1;
-               mysid.id_auth[5] = 5;
-               mysid.num_auths = 0;
-               mysid.sub_auths[mysid.num_auths++] = 21;
-
-               generate_random_buffer( raw_sid_data, 12, True);
-               for( i = 0; i < 3; i++)
-                       mysid.sub_auths[mysid.num_auths++] = IVAL(raw_sid_data, i*4);
-
-               sid_to_string(sid_string, &mysid);
-       } 
-       
-       fstrcat(sid_string, "\n");
-       
-       /*
-        * Ensure our new SID is valid.
-        */
-       
-       if(!string_to_sid( &global_sam_sid, sid_string)) {
-               DEBUG(0,("unable to generate machine SID.\n"));
-               return False;
-       } 
-  
-       /*
-        * Do an exclusive blocking lock on the file.
-        */
-       
-       if(!do_file_lock( fd, 60, F_WRLCK)) {
-               DEBUG(0,("unable to lock file %s. Error was %s\n",
-                        sid_file, strerror(errno) ));
-               close(fd);
-               return False;
-       } 
-       if(!overwrite_bad_sid) {
-               /*
-                * At this point we have a blocking lock on the SID
-                * file - check if in the meantime someone else wrote
-                * SID data into the file. If so - they were here first,
-                * use their data.
-                */
-       
-               if(sys_fstat( fd, &st) < 0) {
-                       DEBUG(0,("unable to stat file %s. Error was %s\n",
-                                sid_file, strerror(errno) ));
-                       close(fd);
-                       return False;
-               } 
-  
-               if(st.st_size > 0) {
-                       /*
-                        * Unlock as soon as possible to reduce
-                        * contention on the exclusive lock.
-                        */ 
-                       do_file_lock( fd, 60, F_UNLCK);
-               
-                       /*
-                        * We have a valid SID - read it.
-                        */
-               
-                       if(!read_sid_from_file( fd, sid_file)) {
-                               DEBUG(0,("unable to read file %s. Error was %s\n",
-                                        sid_file, strerror(errno) ));
-                               close(fd);
-                               return False;
-                       }
-                       close(fd);
-                       return True;
-               } 
-       }
-       
-       /*
-        * The file is still empty and we have an exlusive lock on it,
-        * or we're fixing an earlier mistake.
-        * Write out out SID data into the file.
-        */
-
-       /*
-        * Use chmod here as some (strange) UNIX's don't
-        * have fchmod. JRA.
-        */     
-
-       if(chmod(sid_file, 0644) < 0) {
-               DEBUG(0,("unable to set correct permissions on file %s. \
-Error was %s\n", sid_file, strerror(errno) ));
-               do_file_lock( fd, 60, F_UNLCK);
-               close(fd);
-               return False;
-       } 
-       
-       if(write( fd, sid_string, strlen(sid_string)) != strlen(sid_string)) {
-               DEBUG(0,("unable to write file %s. Error was %s\n",
-                        sid_file, strerror(errno) ));
-               do_file_lock( fd, 60, F_UNLCK);
-               close(fd);
-               return False;
-       } 
-       
-       /*
-        * Unlock & exit.
-        */
-       
-       do_file_lock( fd, 60, F_UNLCK);
-       close(fd);
-       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);
-}
-
-/*******************************************************************
- Converts NT user RID to a UNIX gid.
- ********************************************************************/
-
-gid_t pdb_user_rid_to_gid(uint32 user_rid)
-{
-       return (uid_t)(((user_rid & (~GROUP_RID_TYPE))- 1000)/RID_MULTIPLIER);
+gid_t pdb_group_rid_to_gid(uint32 group_rid)
+{
+       return (gid_t)(((group_rid & (~GROUP_RID_TYPE))- 1000)/RID_MULTIPLIER);
 }
 
 /*******************************************************************
@@ -1048,6 +441,10 @@ uint32 pdb_uid_to_user_rid(uid_t uid)
 
 /*******************************************************************
  converts NT Group RID to a UNIX uid.
+ warning: you must not call that function only
+ you must do a call to the group mapping first.
+ there is not anymore a direct link between the gid and the rid.
  ********************************************************************/
 
 uint32 pdb_gid_to_group_rid(gid_t gid)
@@ -1067,7 +464,7 @@ 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
@@ -1091,34 +488,48 @@ 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_sid(DOM_SID *sid, char *name, enum SID_NAME_USE *psid_name_use)
 {
+       uint32 rid;
+       BOOL is_user;
 
-       BOOL is_user = pdb_rid_is_user(rid);
+       sid_peek_rid(sid, &rid);
+       is_user = pdb_rid_is_user(rid);
+       *psid_name_use = SID_NAME_UNKNOWN;
 
-       DEBUG(5,("lookup_local_rid: looking up %s RID %u.\n", is_user ? "user" :
+       DEBUG(5,("local_lookup_sid: looking up %s RID %u.\n", is_user ? "user" :
                        "group", (unsigned int)rid));
 
        if(is_user) {
                if(rid == DOMAIN_USER_RID_ADMIN) {
                        pstring admin_users;
                        char *p = admin_users;
-                       pstrcpy( admin_users, lp_domain_admin_users());
+                       *psid_name_use = SID_NAME_USER;
                        if(!next_token(&p, name, NULL, sizeof(fstring)))
                                fstrcpy(name, "Administrator");
                } else if (rid == DOMAIN_USER_RID_GUEST) {
                        pstring guest_users;
                        char *p = guest_users;
-                       pstrcpy( guest_users, lp_domain_guest_users());
+                       *psid_name_use = SID_NAME_USER;
                        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_sid: looking up uid %u %s\n", (unsigned int)uid,
                                pass ? "succeeded" : "failed" ));
 
                        if(!pass) {
@@ -1128,27 +539,49 @@ 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_sid: 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; 
+               GROUP_MAP map;
+               
+               /* 
+                * Don't try to convert the rid to a name if running
+                * in appliance mode
+                */
+               
+               if (lp_hide_local_users()) 
+                       return False;
+
+               /* check if it's a mapped group */
+               if (get_group_map_from_sid(*sid, &map, MAPPING_WITHOUT_PRIV)) {
+                       if (map.gid!=-1) {
+                               DEBUG(5,("local_lookup_sid: mapped group %s to gid %u\n", map.nt_name, (unsigned int)map.gid));
+                               fstrcpy(name, map.nt_name);
+                               *psid_name_use = map.sid_name_use;
+                               return True;
+                       }
+               }
+               
+               gid = pdb_group_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_lookup_sid: looking up gid %u %s\n", (unsigned int)gid,
                        gr ? "succeeded" : "failed" ));
 
                if(!gr) {
                        slprintf(name, sizeof(fstring)-1, "unix_group.%u", (unsigned int)gid);
-                       return True;
+                       return False;
                }
 
                fstrcpy( name, gr->gr_name);
 
-               DEBUG(5,("lookup_local_rid: found group %s for rid %u\n", name,
+               DEBUG(5,("local_lookup_sid: found group %s for rid %u\n", name,
                        (unsigned int)rid ));
        }
 
@@ -1159,16 +592,25 @@ 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(const char *c_domain, const char *c_user, DOM_SID *psid, enum SID_NAME_USE *psid_name_use)
 {
        extern DOM_SID global_sid_World_Domain;
        struct passwd *pass = NULL;
        DOM_SID local_sid;
+       fstring user;
+       fstring domain;
 
-       sid_copy(&local_sid, &global_sam_sid);
+       *psid_name_use = SID_NAME_UNKNOWN;
 
-       if(!strequal(global_myname, domain) && !strequal(global_myworkgroup, domain))
-               return False;
+       /*
+        * domain and user may be quoted const strings, and map_username and
+        * friends can modify them. Make a modifiable copy. JRA.
+        */
+
+       fstrcpy(domain, c_domain);
+       fstrcpy(user, c_user);
+
+       sid_copy(&local_sid, &global_sam_sid);
 
        /*
         * Special case for MACHINE\Everyone. Map to the world_sid.
@@ -1181,26 +623,505 @@ 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 = Get_Pwnam(user))) {
+               sid_append_rid( &local_sid, pdb_uid_to_user_rid(pass->pw_uid));
+               *psid_name_use = SID_NAME_USER;
+       } else {
                /*
                 * Maybe it was a group ?
                 */
-               struct group *grp = getgrnam(user);
+               struct group *grp;
+               GROUP_MAP map;
+               
+               /* check if it's a mapped group */
+               if (get_group_map_from_ntname(user, &map, MAPPING_WITHOUT_PRIV)) {
+                       if (map.gid!=-1) {
+                               /* yes it's a mapped group to a valid unix group */
+                               sid_copy(&local_sid, &map.sid);
+                               *psid_name_use = map.sid_name_use;
+                       }
+                       else
+                               /* it's a correct name but not mapped so it points to nothing*/
+                               return False;
+               } else {
+                       /* it's not a mapped group */
+                       grp = getgrnam(user);
+                       if(!grp)
+                               return False;
+
+                       /* 
+                        *check if it's mapped, if it is reply it doesn't exist
+                        *
+                        * that's to prevent this case:
+                        *
+                        * unix group ug is mapped to nt group ng
+                        * someone does a lookup on ug
+                        * we must not reply as it doesn't "exist" anymore
+                        * for NT. For NT only ng exists.
+                        * JFM, 30/11/2001
+                        */
+                       
+                       if(get_group_map_from_gid(grp->gr_gid, &map, MAPPING_WITHOUT_PRIV)){
+                               return False;
+                       }
+
+                       sid_append_rid( &local_sid, pdb_gid_to_group_rid(grp->gr_gid));
+                       *psid_name_use = SID_NAME_ALIAS;
+               }
+       }
+
+       sid_copy( psid, &local_sid);
+
+       return True;
+}
+
+/****************************************************************************
+ Convert a uid to SID - locally.
+****************************************************************************/
 
-               if(!grp)
+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;
+       fstring str;
+       struct passwd *pass;
+
+       *name_type = SID_NAME_UNKNOWN;
+
+       sid_copy(&dom_sid, psid);
+       sid_split_rid(&dom_sid, &rid);
+
+       if (!pdb_rid_is_user(rid))
+               return False;
+
+       /*
+        * 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(!(pass = sys_getpwuid(*puid)))
+               return False;
+
+       DEBUG(10,("local_sid_to_uid: SID %s -> uid (%u) (%s).\n", sid_to_string( str, psid),
+               (unsigned int)*puid, pass->pw_name ));
+
+       *name_type = SID_NAME_USER;
+
+       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;
+       GROUP_MAP map;
+
+       sid_copy(psid, &global_sam_sid);
+       
+       if (get_group_map_from_gid(gid, &map, MAPPING_WITHOUT_PRIV)) {
+               sid_copy(psid, &map.sid);
+       }
+       else {
+               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;
+       fstring str;
+       struct group *grp;
+       GROUP_MAP map;
+
+       *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).
+        *
+        * Or in the Builtin SID too. JFM, 11/30/2001
+        */
+
+       if (!sid_equal(&global_sam_sid, &dom_sid))
+               return False;
+
+       if (pdb_rid_is_user(rid))
+               return False;
+
+       if (get_group_map_from_sid(*psid, &map, MAPPING_WITHOUT_PRIV)) {
+               
+               /* the SID is in the mapping table but not mapped */
+               if (map.gid==-1)
                        return False;
 
-               sid_append_rid( &local_sid, pdb_gid_to_group_rid(grp->gr_gid));
-               *psid_name_use = SID_NAME_ALIAS;
+               sid_peek_rid(&map.sid, &rid);
+               *pgid = rid;
+               *name_type = map.sid_name_use;
        } else {
+               *pgid = pdb_group_rid_to_gid(rid);
+               *name_type = SID_NAME_ALIAS;
+       }
 
-               sid_append_rid( &local_sid, pdb_uid_to_user_rid(pass->pw_uid));
-               *psid_name_use = SID_NAME_USER;
+       /*
+        * Ensure this gid really does exist.
+        */
+
+       if(!(grp = getgrgid(*pgid)))
+               return False;
+
+       DEBUG(10,("local_sid_to_gid: SID %s -> gid (%u) (%s).\n", sid_to_string( str, psid),
+               (unsigned int)*pgid, grp->gr_name ));
+
+       return True;
+}
+
+/** 
+ * Quick hack to do an easy ucs2 -> mulitbyte conversion 
+ * @return static buffer containing the converted string
+ **/
+
+static char *pdb_convert(const UNISTR2 *from)
+{
+       static pstring convert_buffer;
+       *convert_buffer = 0;
+       if (!from) {
+               return convert_buffer;
        }
 
-       sid_copy( psid, &local_sid);
+       unistr2_to_ascii(convert_buffer, from, sizeof(pstring));
+       return convert_buffer;
+}
+
+/*************************************************************
+ Copies a SAM_USER_INFO_23 to a SAM_ACCOUNT
+ **************************************************************/
+
+void copy_id23_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_23 *from)
+{
+
+       if (from == NULL || to == NULL) 
+               return;
+
+       pdb_set_logon_time(to,nt_time_to_unix(&from->logon_time));
+       pdb_set_logoff_time(to,nt_time_to_unix(&from->logoff_time));
+       pdb_set_kickoff_time(to, nt_time_to_unix(&from->kickoff_time));
+       pdb_set_pass_last_set_time(to, nt_time_to_unix(&from->pass_last_set_time));
+       pdb_set_pass_can_change_time(to, nt_time_to_unix(&from->pass_can_change_time));
+       pdb_set_pass_must_change_time(to, nt_time_to_unix(&from->pass_must_change_time));
+
+       pdb_set_username(to      , pdb_convert(&from->uni_user_name   ));
+       pdb_set_fullname(to      , pdb_convert(&from->uni_full_name   ));
+       pdb_set_homedir(to       , pdb_convert(&from->uni_home_dir    ), True);
+       pdb_set_dir_drive(to     , pdb_convert(&from->uni_dir_drive   ), True);
+       pdb_set_logon_script(to  , pdb_convert(&from->uni_logon_script), True);
+       pdb_set_profile_path(to  , pdb_convert(&from->uni_profile_path), True);
+       pdb_set_acct_desc(to     , pdb_convert(&from->uni_acct_desc   ));
+       pdb_set_workstations(to  , pdb_convert(&from->uni_workstations));
+       pdb_set_unknown_str(to   , pdb_convert(&from->uni_unknown_str ));
+       pdb_set_munged_dial(to   , pdb_convert(&from->uni_munged_dial ));
+
+       if (from->user_rid)
+               pdb_set_user_rid(to, from->user_rid);
+       if (from->group_rid)
+               pdb_set_group_rid(to, from->group_rid);
+
+       pdb_set_acct_ctrl(to, from->acb_info);
+       pdb_set_unknown_3(to, from->unknown_3);
+
+       pdb_set_logon_divs(to, from->logon_divs);
+       pdb_set_hours_len(to, from->logon_hrs.len);
+       pdb_set_hours(to, from->logon_hrs.hours);
+
+       pdb_set_unknown_5(to, from->unknown_5);
+       pdb_set_unknown_6(to, from->unknown_6);
+}
+
+
+/*************************************************************
+ Copies a sam passwd.
+ **************************************************************/
+
+void copy_id21_to_sam_passwd(SAM_ACCOUNT *to, SAM_USER_INFO_21 *from)
+{
+       if (from == NULL || to == NULL) 
+               return;
+
+       pdb_set_logon_time(to,nt_time_to_unix(&from->logon_time));
+       pdb_set_logoff_time(to,nt_time_to_unix(&from->logoff_time));
+       pdb_set_kickoff_time(to, nt_time_to_unix(&from->kickoff_time));
+       pdb_set_pass_last_set_time(to, nt_time_to_unix(&from->pass_last_set_time));
+       pdb_set_pass_can_change_time(to, nt_time_to_unix(&from->pass_can_change_time));
+       pdb_set_pass_must_change_time(to, nt_time_to_unix(&from->pass_must_change_time));
+
+       pdb_set_username(to      , pdb_convert(&from->uni_user_name   ));
+       pdb_set_fullname(to      , pdb_convert(&from->uni_full_name   ));
+       pdb_set_homedir(to       , pdb_convert(&from->uni_home_dir    ), True);
+       pdb_set_dir_drive(to     , pdb_convert(&from->uni_dir_drive   ), True);
+       pdb_set_logon_script(to  , pdb_convert(&from->uni_logon_script), True);
+       pdb_set_profile_path(to  , pdb_convert(&from->uni_profile_path), True);
+       pdb_set_acct_desc(to     , pdb_convert(&from->uni_acct_desc   ));
+       pdb_set_workstations(to  , pdb_convert(&from->uni_workstations));
+       pdb_set_unknown_str(to   , pdb_convert(&from->uni_unknown_str ));
+       pdb_set_munged_dial(to   , pdb_convert(&from->uni_munged_dial ));
+
+       if (from->user_rid)
+               pdb_set_user_rid(to, from->user_rid);
+       if (from->group_rid)
+               pdb_set_group_rid(to, from->group_rid);
+
+       /* FIXME!!  Do we need to copy the passwords here as well?
+          I don't know.  Need to figure this out   --jerry */
+
+       /* Passwords dealt with in caller --abartlet */
+
+       pdb_set_acct_ctrl(to, from->acb_info);
+       pdb_set_unknown_3(to, from->unknown_3);
+
+       pdb_set_logon_divs(to, from->logon_divs);
+       pdb_set_hours_len(to, from->logon_hrs.len);
+       pdb_set_hours(to, from->logon_hrs.hours);
+
+       pdb_set_unknown_5(to, from->unknown_5);
+       pdb_set_unknown_6(to, from->unknown_6);
+}
 
+
+/*************************************************************
+ 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,
+ in SWAT and by smbpasswd/pdbedit.
+ --jerry
+ *************************************************************/
+
+BOOL local_password_change(const char *user_name, int local_flags,
+                          const 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=NULL;
+
+       *err_str = '\0';
+       *msg_str = '\0';
+
+       /* Get the smb passwd entry for this user */
+       pdb_init_sam(&sam_pass);
+       if(!pdb_getsampwnam(sam_pass, user_name)) {
+               pdb_free_sam(&sam_pass);
+               
+               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;
+                       }
+               } else {
+                       slprintf(err_str, err_str_len-1,"Failed to find entry for user %s.\n", user_name);
+                       return False;
+               }
+
+               if (!pdb_init_sam_pw(&sam_pass, pwd)) {
+                       slprintf(err_str, err_str_len-1, "Failed initialise SAM_ACCOUNT for user %s.\n", user_name);
+                       return False;
+               }
+
+       
+               if (local_flags & LOCAL_TRUST_ACCOUNT) {
+                       if (!pdb_set_acct_ctrl(sam_pass, ACB_WSTRUST)) {
+                               slprintf(err_str, err_str_len - 1, "Failed to set 'trusted workstation account' flags for user %s.\n", user_name);
+                               pdb_free_sam(&sam_pass);
+                               return False;
+                       }
+               } else if (local_flags & LOCAL_INTERDOM_ACCOUNT) {
+                       if (!pdb_set_acct_ctrl(sam_pass, ACB_DOMTRUST)) {
+                               slprintf(err_str, err_str_len - 1, "Failed to set 'domain trust account' flags for user %s.\n", user_name);
+                               pdb_free_sam(&sam_pass);
+                               return False;
+                       }
+               } else {
+                       if (!pdb_set_acct_ctrl(sam_pass, ACB_NORMAL)) {
+                               slprintf(err_str, err_str_len - 1, "Failed to set 'normal account' flags for user %s.\n", user_name);
+                               pdb_free_sam(&sam_pass);
+                               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) {
+               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_DISABLED)) {
+                       slprintf(err_str, err_str_len-1, "Failed to set 'disabled' flag for user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return False;
+               }
+       } else if (local_flags & LOCAL_ENABLE_USER) {
+               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED))) {
+                       slprintf(err_str, err_str_len-1, "Failed to unset 'disabled' flag for user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return False;
+               }
+       }
+       
+       if (local_flags & LOCAL_SET_NO_PASSWORD) {
+               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)|ACB_PWNOTREQ)) {
+                       slprintf(err_str, err_str_len-1, "Failed to set 'no password required' flag for user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return False;
+               }
+       } else if (local_flags & LOCAL_SET_PASSWORD) {
+               /*
+                * 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)) {
+                       if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_DISABLED))) {
+                               slprintf(err_str, err_str_len-1, "Failed to unset 'disabled' flag for user %s.\n", user_name);
+                               pdb_free_sam(&sam_pass);
+                               return False;
+                       }
+               }
+               if (!pdb_set_acct_ctrl (sam_pass, pdb_get_acct_ctrl(sam_pass)&(~ACB_PWNOTREQ))) {
+                       slprintf(err_str, err_str_len-1, "Failed to unset 'no password required' flag for user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return False;
+               }
+               
+               if (!pdb_set_plaintext_passwd (sam_pass, new_passwd)) {
+                       slprintf(err_str, err_str_len-1, "Failed to set password for user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return False;
+               }
+       }       
+
+       if (local_flags & LOCAL_ADD_USER) {
+               if (pdb_add_sam_account(sam_pass)) {
+                       slprintf(msg_str, msg_str_len-1, "Added user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return True;
+               } else {
+                       slprintf(err_str, err_str_len-1, "Failed to add entry for user %s.\n", user_name);
+                       pdb_free_sam(&sam_pass);
+                       return False;
+               }
+       } else 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);
+                       pdb_free_sam(&sam_pass);
+                       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);
+                       pdb_free_sam(&sam_pass);
+                       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);
+       }
+
+       pdb_free_sam(&sam_pass);
        return True;
 }
+
+/***************************************************************************
+ Search by uid.  Wrapper around pdb_getsampwnam()
+ **************************************************************************/
+
+BOOL pdb_getsampwuid (SAM_ACCOUNT* user, uid_t uid)
+{
+       struct passwd   *pw;
+       fstring         name;
+
+       if (user==NULL) {
+               DEBUG(0,("pdb_getsampwuid: SAM_ACCOUNT is NULL.\n"));
+               return False;
+       }
+
+       /*
+        * Never trust the uid in the passdb.  Lookup the username first
+        * and then lokup the user by name in the sam.
+        */
+        
+       if ((pw=sys_getpwuid(uid)) == NULL)  {
+               DEBUG(0,("pdb_getsampwuid: getpwuid(%d) return NULL. User does not exist in Unix accounts!\n", uid));
+               return False;
+       }
+       
+       fstrcpy (name, pw->pw_name);
+
+       return pdb_getsampwnam (user, name);
+
+}
+