*id_to_*id call reshape to return NTSTATUS errors
[ira/wip.git] / source3 / utils / pdbedit.c
index 64a152aaa1e1a5202a23c71548adb67f360bdf58..4cb3db52b7f4a0be56089992a4e0e0ac9262f2f6 100644 (file)
@@ -1,10 +1,10 @@
 /* 
-   Unix SMB/Netbios implementation.
+   Unix SMB/CIFS implementation.
    passdb editing frontend
-   Version 3.0
    
    Copyright (C) Simo Sorce      2000
    Copyright (C) Andrew Bartlett 2001   
+   Copyright (C) Jelmer Vernooij 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
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/* base uid for trust accounts is set to 60000 ! 
- * May be we should add the defines in smb.h to make it possible having 
- * different values on different platforms?
- */
+#include "includes.h"
 
-#define BASE_MACHINE_UID 60000
-#define MAX_MACHINE_UID 65500 /* 5500 trust accounts aren't enough? */
+#define BIT_BACKEND    0x00000004
+#define BIT_VERBOSE    0x00000008
+#define BIT_SPSTYLE    0x00000010
+#define BIT_RESERV_1   0x00000020
+#define BIT_RESERV_2   0x00000040
+#define BIT_RESERV_3   0x00000080
+#define BIT_FULLNAME   0x00000100
+#define BIT_HOMEDIR    0x00000200
+#define BIT_HDIRDRIVE  0x00000400
+#define BIT_LOGSCRIPT  0x00000800
+#define BIT_PROFILE    0x00001000
+#define BIT_MACHINE    0x00002000
+#define BIT_RESERV_4   0x00004000
+#define BIT_USER       0x00008000
+#define BIT_LIST       0x00010000
+#define BIT_MODIFY     0x00020000
+#define BIT_CREATE     0x00040000
+#define BIT_DELETE     0x00080000
+#define BIT_ACCPOLICY  0x00100000
+#define BIT_ACCPOLVAL  0x00200000
+#define BIT_ACCTCTRL   0x00400000
+#define BIT_RESERV_7   0x00800000
+#define BIT_IMPORT     0x01000000
+#define BIT_EXPORT     0x02000000
+
+#define MASK_ALWAYS_GOOD       0x0000001F
+#define MASK_USER_GOOD         0x00401F00
 
-#include "includes.h"
+/*********************************************************
+ Add all currently available users to another db
+ ********************************************************/
+
+static int export_database (struct pdb_context *in, struct pdb_context *out) {
+       SAM_ACCOUNT *user = NULL;
+
+       if (NT_STATUS_IS_ERR(in->pdb_setsampwent(in, 0))) {
+               fprintf(stderr, "Can't sampwent!\n");
+               return 1;
+       }
+
+       if (!NT_STATUS_IS_OK(pdb_init_sam(&user))) {
+               fprintf(stderr, "Can't initialize new SAM_ACCOUNT!\n");
+               return 1;
+       }
 
-extern pstring global_myname;
-extern int DEBUGLEVEL;
+       while (NT_STATUS_IS_OK(in->pdb_getsampwent(in, user))) {
+               out->pdb_add_sam_account(out, user);
+               if (!NT_STATUS_IS_OK(pdb_reset_sam(user))){
+                       fprintf(stderr, "Can't reset SAM_ACCOUNT!\n");
+                       return 1;
+               }
+       }
 
-/*
- * Next two lines needed for SunOS and don't
- * hurt anything else...
- */
-extern char *optarg;
-extern int optind;
+       in->pdb_endsampwent(in);
+
+       return 0;
+}
 
 /*********************************************************
- Print command usage on stderr and die.
-**********************************************************/
-static void usage(void)
-{
-       if (getuid() == 0) {
-               printf("tdbedit options\n");
-       } else {
-               printf("You need to be root to use this tool!\n");
-       }
-       printf("(actually to add a user you need to use smbpasswd)\n");
-       printf("options:\n");
-       printf("  -l                   list usernames\n");
-       printf("     -v                verbose output\n");
-       printf("     -w                smbpasswd file style\n");
-       printf("  -u username          print user's info\n");
-       printf("     -f fullname       set Full Name\n");
-       printf("     -h homedir        set home directory\n");
-       printf("     -d drive          set home dir drive\n");
-       printf("     -s script         set logon script\n");
-       printf("     -p profile        set profile path\n");
-       printf("  -a                   create new account\n");
-       printf("     -m                it is a machine trust\n");
-       printf("  -x                   delete this user\n");
-       printf("  -i file              import account from file (smbpasswd style)\n");
-       exit(1);
+ Add all currently available group mappings to another db
+ ********************************************************/
+
+static int export_groups (struct pdb_context *in, struct pdb_context *out) {
+       GROUP_MAP *maps = NULL;
+       int i, entries = 0;
+
+       if (NT_STATUS_IS_ERR(in->pdb_enum_group_mapping(in, SID_NAME_UNKNOWN,
+                                                       &maps, &entries,
+                                                       False, False))) {
+               fprintf(stderr, "Can't get group mappings!\n");
+               return 1;
+       }
+
+       for (i=0; i<entries; i++) {
+               out->pdb_add_group_mapping_entry(out, &(maps[i]));
+       }
+
+       SAFE_FREE(maps);
+
+       return 0;
 }
 
 /*********************************************************
@@ -75,41 +111,71 @@ static void usage(void)
 
 static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdstyle)
 {
+       uid_t uid;
+       gid_t gid;
+       time_t tmp;
+
        /* TODO: chaeck if entry is a user or a workstation */
        if (!sam_pwent) return -1;
        
        if (verbosity) {
-               printf ("username:       %s\n", sam_pwent->username);
-               printf ("user ID/Group:  %d/%d\n", sam_pwent->uid,
-                                                 sam_pwent->gid);
-               printf ("user RID/GRID:  %d/%d\n", sam_pwent->user_rid,
-                                                 sam_pwent->group_rid);
-               printf ("Full Name:      %s\n", sam_pwent->full_name);
-               printf ("Home Directory: %s\n", sam_pwent->home_dir);
-               printf ("HomeDir Drive:  %s\n", sam_pwent->dir_drive);
-               printf ("Logon Script:   %s\n", sam_pwent->logon_script);
-               printf ("Profile Path:   %s\n", sam_pwent->profile_path);
+               printf ("Unix username:        %s\n", pdb_get_username(sam_pwent));
+               printf ("NT username:          %s\n", pdb_get_nt_username(sam_pwent));
+               printf ("Account Flags:        %s\n", pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent), NEW_PW_FORMAT_SPACE_PADDED_LEN));
+               printf ("User SID:             %s\n",
+                       sid_string_static(pdb_get_user_sid(sam_pwent)));
+               printf ("Primary Group SID:    %s\n",
+                       sid_string_static(pdb_get_group_sid(sam_pwent)));
+               printf ("Full Name:            %s\n", pdb_get_fullname(sam_pwent));
+               printf ("Home Directory:       %s\n", pdb_get_homedir(sam_pwent));
+               printf ("HomeDir Drive:        %s\n", pdb_get_dir_drive(sam_pwent));
+               printf ("Logon Script:         %s\n", pdb_get_logon_script(sam_pwent));
+               printf ("Profile Path:         %s\n", pdb_get_profile_path(sam_pwent));
+               printf ("Domain:               %s\n", pdb_get_domain(sam_pwent));
+               printf ("Account desc:         %s\n", pdb_get_acct_desc(sam_pwent));
+               printf ("Workstations:         %s\n", pdb_get_workstations(sam_pwent));
+               printf ("Munged dial:          %s\n", pdb_get_munged_dial(sam_pwent));
+               
+               tmp = pdb_get_logon_time(sam_pwent);
+               printf ("Logon time:           %s\n", tmp ? http_timestring(tmp) : "0");
+               
+               tmp = pdb_get_logoff_time(sam_pwent);
+               printf ("Logoff time:          %s\n", tmp ? http_timestring(tmp) : "0");
+               
+               tmp = pdb_get_kickoff_time(sam_pwent);
+               printf ("Kickoff time:         %s\n", tmp ? http_timestring(tmp) : "0");
+               
+               tmp = pdb_get_pass_last_set_time(sam_pwent);
+               printf ("Password last set:    %s\n", tmp ? http_timestring(tmp) : "0");
+               
+               tmp = pdb_get_pass_can_change_time(sam_pwent);
+               printf ("Password can change:  %s\n", tmp ? http_timestring(tmp) : "0");
+               
+               tmp = pdb_get_pass_must_change_time(sam_pwent);
+               printf ("Password must change: %s\n", tmp ? http_timestring(tmp) : "0");
+               
        } else if (smbpwdstyle) {
                char lm_passwd[33];
                char nt_passwd[33];
-               pdb_sethexpwd(lm_passwd, 
-                             pdb_get_lanman_passwd(sam_pwent), 
-                             pdb_get_acct_ctrl(sam_pwent));
-               pdb_sethexpwd(nt_passwd, 
-                             pdb_get_nt_passwd(sam_pwent), 
-                             pdb_get_acct_ctrl(sam_pwent));
-               
+
+               uid = -1;
+               sid_to_uid(pdb_get_user_sid(sam_pwent), &uid);
+               pdb_sethexpwd(lm_passwd, pdb_get_lanman_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
+               pdb_sethexpwd(nt_passwd, pdb_get_nt_passwd(sam_pwent), pdb_get_acct_ctrl(sam_pwent));
+                       
                printf("%s:%d:%s:%s:%s:LCT-%08X:\n",
-                       pdb_get_username(sam_pwent),
-                       pdb_get_uid(sam_pwent),
-                       lm_passwd,
-                       nt_passwd,
-                       pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
-                       (uint32)pdb_get_pass_last_set_time(sam_pwent));
+                      pdb_get_username(sam_pwent),
+                      uid,
+                      lm_passwd,
+                      nt_passwd,
+                      pdb_encode_acct_ctrl(pdb_get_acct_ctrl(sam_pwent),NEW_PW_FORMAT_SPACE_PADDED_LEN),
+                      (uint32)pdb_get_pass_last_set_time(sam_pwent));
        } else {
-               printf ("%s:%d:%s\n", sam_pwent->username, sam_pwent->uid, sam_pwent->full_name);
-       }       
-       
+               uid = -1;
+               sid_to_uid(pdb_get_user_sid(sam_pwent), &uid);
+               printf ("%s:%d:%s\n", pdb_get_username(sam_pwent), uid, pdb_get_fullname(sam_pwent));
+       }
+
        return 0;       
 }
 
@@ -117,14 +183,16 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst
  Get an Print User Info
 **********************************************************/
 
-static int print_user_info (char *username, BOOL verbosity, BOOL smbpwdstyle)
+static int print_user_info (struct pdb_context *in, const char *username, BOOL verbosity, BOOL smbpwdstyle)
 {
        SAM_ACCOUNT *sam_pwent=NULL;
        BOOL ret;
        
-       pdb_init_sam(&sam_pwent);
+       if (!NT_STATUS_IS_OK(pdb_init_sam (&sam_pwent))) {
+               return -1;
+       }
        
-       ret = pdb_getsampwnam (sam_pwent, username);
+       ret = NT_STATUS_IS_OK(in->pdb_getsampwnam (in, sam_pwent, username));
 
        if (ret==False) {
                fprintf (stderr, "Username not found!\n");
@@ -141,29 +209,29 @@ static int print_user_info (char *username, BOOL verbosity, BOOL smbpwdstyle)
 /*********************************************************
  List Users
 **********************************************************/
-static int print_users_list (BOOL verbosity, BOOL smbpwdstyle)
+static int print_users_list (struct pdb_context *in, BOOL verbosity, BOOL smbpwdstyle)
 {
        SAM_ACCOUNT *sam_pwent=NULL;
-       BOOL ret;
+       BOOL check, ret;
        
-       pdb_init_sam(&sam_pwent);
-
-       ret = pdb_setsampwent(False);
-       if (ret && errno == ENOENT) {
-               fprintf (stderr,"Password database not found!\n");
-               pdb_free_sam(&sam_pwent);
-               exit(1);
+       check = NT_STATUS_IS_OK(in->pdb_setsampwent(in, False));
+       if (!check) {
+               return 1;
        }
 
-       while ((ret = pdb_getsampwent (sam_pwent))) {
+       check = True;
+       if (!(NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent)))) return 1;
+
+       while (check && (ret = NT_STATUS_IS_OK(in->pdb_getsampwent (in, sam_pwent)))) {
                if (verbosity)
                        printf ("---------------\n");
                print_sam_info (sam_pwent, verbosity, smbpwdstyle);
-               pdb_reset_sam(sam_pwent);
+               pdb_free_sam(&sam_pwent);
+               check = NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent));
        }
+       if (check) pdb_free_sam(&sam_pwent);
        
-       pdb_endsampwent ();
-       pdb_free_sam(&sam_pwent);
+       in->pdb_endsampwent(in);
        return 0;
 }
 
@@ -171,14 +239,18 @@ static int print_users_list (BOOL verbosity, BOOL smbpwdstyle)
  Set User Info
 **********************************************************/
 
-static int set_user_info (char *username, char *fullname, char *homedir, char *drive, char *script, char *profile)
+static int set_user_info (struct pdb_context *in, const char *username, 
+                         const char *fullname, const char *homedir, 
+                         const char *drive, const char *script, 
+                         const char *profile, const char *account_control,
+                         const char *user_sid, const char *group_sid)
 {
        SAM_ACCOUNT *sam_pwent=NULL;
        BOOL ret;
        
        pdb_init_sam(&sam_pwent);
        
-       ret = pdb_getsampwnam (sam_pwent, username);
+       ret = NT_STATUS_IS_OK(in->pdb_getsampwnam (in, sam_pwent, username));
        if (ret==False) {
                fprintf (stderr, "Username not found!\n");
                pdb_free_sam(&sam_pwent);
@@ -186,18 +258,65 @@ static int set_user_info (char *username, char *fullname, char *homedir, char *d
        }
        
        if (fullname)
-               pdb_set_fullname(sam_pwent, fullname);
+               pdb_set_fullname(sam_pwent, fullname, PDB_CHANGED);
        if (homedir)
-               pdb_set_homedir(sam_pwent, homedir);
+               pdb_set_homedir(sam_pwent, homedir, PDB_CHANGED);
        if (drive)
-               pdb_set_dir_drive(sam_pwent,drive);
+               pdb_set_dir_drive(sam_pwent,drive, PDB_CHANGED);
        if (script)
-               pdb_set_logon_script(sam_pwent, script);
+               pdb_set_logon_script(sam_pwent, script, PDB_CHANGED);
        if (profile)
-               pdb_set_profile_path (sam_pwent, profile);
+               pdb_set_profile_path (sam_pwent, profile, PDB_CHANGED);
+
+       if (account_control) {
+               uint16 not_settable = ~(ACB_DISABLED|ACB_HOMDIRREQ|ACB_PWNOTREQ|
+                                       ACB_PWNOEXP|ACB_AUTOLOCK);
+
+               uint16 newflag = pdb_decode_acct_ctrl(account_control);
+
+               if (newflag & not_settable) {
+                       fprintf(stderr, "Can only set [NDHLX] flags\n");
+                       pdb_free_sam(&sam_pwent);
+                       return -1;
+               }
+
+               pdb_set_acct_ctrl(sam_pwent,
+                                 (pdb_get_acct_ctrl(sam_pwent) & not_settable) | newflag,
+                                 PDB_CHANGED);
+       }
+       if (user_sid) {
+               DOM_SID u_sid;
+               if (!string_to_sid(&u_sid, user_sid)) {
+                       /* not a complete sid, may be a RID, try building a SID */
+                       int u_rid;
+                       
+                       if (sscanf(user_sid, "%d", &u_rid) != 1) {
+                               fprintf(stderr, "Error passed string is not a complete user SID or RID!\n");
+                               return -1;
+                       }
+                       sid_copy(&u_sid, get_global_sam_sid());
+                       sid_append_rid(&u_sid, u_rid);
+               }
+               pdb_set_user_sid (sam_pwent, &u_sid, PDB_CHANGED);
+       }
+       if (group_sid) {
+               DOM_SID g_sid;
+               if (!string_to_sid(&g_sid, group_sid)) {
+                       /* not a complete sid, may be a RID, try building a SID */
+                       int g_rid;
+                       
+                       if (sscanf(group_sid, "%d", &g_rid) != 1) {
+                               fprintf(stderr, "Error passed string is not a complete group SID or RID!\n");
+                               return -1;
+                       }
+                       sid_copy(&g_sid, get_global_sam_sid());
+                       sid_append_rid(&g_sid, g_rid);
+               }
+               pdb_set_group_sid (sam_pwent, &g_sid, PDB_CHANGED);
+       }
        
-       if (pdb_update_sam_account (sam_pwent, True))
-               print_user_info (username, True, False);
+       if (NT_STATUS_IS_OK(in->pdb_update_sam_account (in, sam_pwent)))
+               print_user_info (in, username, True, False);
        else {
                fprintf (stderr, "Unable to modify entry!\n");
                pdb_free_sam(&sam_pwent);
@@ -210,54 +329,87 @@ static int set_user_info (char *username, char *fullname, char *homedir, char *d
 /*********************************************************
  Add New User
 **********************************************************/
-static int new_user (char *username, char *fullname, char *homedir, char *drive, char *script, char *profile)
+static int new_user (struct pdb_context *in, const char *username,
+                       const char *fullname, const char *homedir,
+                       const char *drive, const char *script,
+                       const char *profile, char *user_sid, char *group_sid)
 {
        SAM_ACCOUNT *sam_pwent=NULL;
-       struct passwd  *pwd = NULL;
-       char *password1, *password2;
+       NTSTATUS nt_status;
+       char *password1, *password2, *staticpass;
        
-       ZERO_STRUCT(sam_pwent);
-
-       pdb_init_sam (&sam_pwent);
-
-       if (!(pwd = sys_getpwnam(username))) {
-               fprintf (stderr, "User %s does not exist in system passwd!\n", username);
-               pdb_free_sam (&sam_pwent);
+       if (!NT_STATUS_IS_OK(nt_status = pdb_init_sam_new(&sam_pwent, username))) {
+               DEBUG(0, ("could not create account to add new user %s\n", username));
                return -1;
        }
-       
-       password1 = getpass("new password:");
-       password2 = getpass("retype new password:");
+
+       staticpass = getpass("new password:");
+       password1 = strdup(staticpass);
+       memset(staticpass, 0, strlen(staticpass));
+       staticpass = getpass("retype new password:");
+       password2 = strdup(staticpass);
+       memset(staticpass, 0, strlen(staticpass));
        if (strcmp (password1, password2)) {
-                fprintf (stderr, "Passwords does not match!\n");
-                pdb_free_sam (&sam_pwent);
-                return -1;
+               fprintf (stderr, "Passwords does not match!\n");
+               memset(password1, 0, strlen(password1));
+               SAFE_FREE(password1);
+               memset(password2, 0, strlen(password2));
+               SAFE_FREE(password2);
+               pdb_free_sam (&sam_pwent);
+               return -1;
        }
 
        pdb_set_plaintext_passwd(sam_pwent, password1);
+       memset(password1, 0, strlen(password1));
+       SAFE_FREE(password1);
+       memset(password2, 0, strlen(password2));
+       SAFE_FREE(password2);
 
-       pdb_set_username(sam_pwent, username);
        if (fullname)
-               pdb_set_fullname(sam_pwent, fullname);
+               pdb_set_fullname(sam_pwent, fullname, PDB_CHANGED);
        if (homedir)
-               pdb_set_homedir (sam_pwent, homedir);
+               pdb_set_homedir (sam_pwent, homedir, PDB_CHANGED);
        if (drive)
-               pdb_set_dir_drive (sam_pwent, drive);
+               pdb_set_dir_drive (sam_pwent, drive, PDB_CHANGED);
        if (script)
-               pdb_set_logon_script(sam_pwent, script);
+               pdb_set_logon_script(sam_pwent, script, PDB_CHANGED);
        if (profile)
-               pdb_set_profile_path (sam_pwent, profile);
+               pdb_set_profile_path (sam_pwent, profile, PDB_CHANGED);
+       if (user_sid) {
+               DOM_SID u_sid;
+               if (!string_to_sid(&u_sid, user_sid)) {
+                       /* not a complete sid, may be a RID, try building a SID */
+                       int u_rid;
+                       
+                       if (sscanf(user_sid, "%d", &u_rid) != 1) {
+                               fprintf(stderr, "Error passed string is not a complete user SID or RID!\n");
+                               return -1;
+                       }
+                       sid_copy(&u_sid, get_global_sam_sid());
+                       sid_append_rid(&u_sid, u_rid);
+               }
+               pdb_set_user_sid (sam_pwent, &u_sid, PDB_CHANGED);
+       }
+       if (group_sid) {
+               DOM_SID g_sid;
+               if (!string_to_sid(&g_sid, group_sid)) {
+                       /* not a complete sid, may be a RID, try building a SID */
+                       int g_rid;
+                       
+                       if (sscanf(group_sid, "%d", &g_rid) != 1) {
+                               fprintf(stderr, "Error passed string is not a complete group SID or RID!\n");
+                               return -1;
+                       }
+                       sid_copy(&g_sid, get_global_sam_sid());
+                       sid_append_rid(&g_sid, g_rid);
+               }
+               pdb_set_group_sid (sam_pwent, &g_sid, PDB_CHANGED);
+       }
        
-       /* TODO: Check uid not being in MACHINE UID range!! */
-       pdb_set_uid (sam_pwent, pwd->pw_uid);
-       pdb_set_gid (sam_pwent, pwd->pw_gid);
-       pdb_set_user_rid (sam_pwent, pdb_uid_to_user_rid (pwd->pw_uid));
-       pdb_set_group_rid (sam_pwent, pdb_gid_to_group_rid (pwd->pw_gid));
-
-       pdb_set_acct_ctrl (sam_pwent, ACB_NORMAL);
+       pdb_set_acct_ctrl (sam_pwent, ACB_NORMAL, PDB_CHANGED);
        
-       if (pdb_add_sam_account (sam_pwent)) { 
-               print_user_info (username, True, False);
+       if (NT_STATUS_IS_OK(in->pdb_add_sam_account (in, sam_pwent))) { 
+               print_user_info (in, username, True, False);
        } else {
                fprintf (stderr, "Unable to add user! (does it alredy exist?)\n");
                pdb_free_sam (&sam_pwent);
@@ -271,52 +423,48 @@ static int new_user (char *username, char *fullname, char *homedir, char *drive,
  Add New Machine
 **********************************************************/
 
-static int new_machine (char *machinename)
+static int new_machine (struct pdb_context *in, const char *machine_in)
 {
        SAM_ACCOUNT *sam_pwent=NULL;
-       SAM_ACCOUNT *sam_trust=NULL;
-       char name[16];
-       char *password = NULL;
-       uid_t uid;
+       fstring machinename;
+       fstring machineaccount;
+       struct passwd  *pwd = NULL;
        
-       pdb_init_sam (&sam_pwent);
+       fstrcpy(machinename, machine_in); 
+       machinename[15]= '\0';
 
        if (machinename[strlen (machinename) -1] == '$')
                machinename[strlen (machinename) -1] = '\0';
        
-       safe_strcpy (name, machinename, 16);
-       safe_strcat (name, "$", 16);
-       
-       string_set (&password, machinename);
-       strlower_m(password);
+       strlower_m(machinename);
        
-       pdb_set_plaintext_passwd (sam_pwent, password);
+       fstrcpy(machineaccount, machinename);
+       fstrcat(machineaccount, "$");
 
-       pdb_set_username (sam_pwent, name);
-       
-       for (uid=BASE_MACHINE_UID; uid<=MAX_MACHINE_UID; uid++) {
-               pdb_init_sam (&sam_trust);
-               if (pdb_getsampwuid (sam_trust, uid)) {
-                       pdb_free_sam (&sam_trust);
-               } else {
-                       break;
+       if ((pwd = getpwnam_alloc(machineaccount))) {
+               if (!NT_STATUS_IS_OK(pdb_init_sam_pw( &sam_pwent, pwd))) {
+                       fprintf(stderr, "Could not init sam from pw\n");
+                       passwd_free(&pwd);
+                       return -1;
+               }
+               passwd_free(&pwd);
+       } else {
+               if (!NT_STATUS_IS_OK(pdb_init_sam (&sam_pwent))) {
+                       fprintf(stderr, "Could not init sam from pw\n");
+                       return -1;
                }
        }
 
-       if (uid>MAX_MACHINE_UID) {
-               fprintf (stderr, "No more free UIDs available to Machine accounts!\n");
-               pdb_free_sam(&sam_pwent);               
-               return -1;
-       }
+       pdb_set_plaintext_passwd (sam_pwent, machinename);
 
-       pdb_set_uid (sam_pwent, uid);
-       pdb_set_gid (sam_pwent, BASE_MACHINE_UID); /* TODO: set there more appropriate value!! */
-       pdb_set_user_rid (sam_pwent,pdb_uid_to_user_rid (uid));
-       pdb_set_group_rid (sam_pwent, pdb_gid_to_group_rid (BASE_MACHINE_UID));
-       pdb_set_acct_ctrl (sam_pwent, ACB_WSTRUST);
+       pdb_set_username (sam_pwent, machineaccount, PDB_CHANGED);
        
-       if (pdb_add_sam_account (sam_pwent)) {
-               print_user_info (name, True, False);
+       pdb_set_acct_ctrl (sam_pwent, ACB_WSTRUST, PDB_CHANGED);
+       
+       pdb_set_group_sid_from_rid(sam_pwent, DOMAIN_GROUP_RID_COMPUTERS, PDB_CHANGED);
+       
+       if (NT_STATUS_IS_OK(in->pdb_add_sam_account (in, sam_pwent))) {
+               print_user_info (in, machineaccount, True, False);
        } else {
                fprintf (stderr, "Unable to add machine! (does it already exist?)\n");
                pdb_free_sam (&sam_pwent);
@@ -330,381 +478,293 @@ static int new_machine (char *machinename)
  Delete user entry
 **********************************************************/
 
-static int delete_user_entry (char *username)
+static int delete_user_entry (struct pdb_context *in, const char *username)
 {
-       return pdb_delete_sam_account (username);
+       SAM_ACCOUNT *samaccount = NULL;
+
+       if (!NT_STATUS_IS_OK(pdb_init_sam (&samaccount))) {
+               return -1;
+       }
+
+       if (NT_STATUS_IS_ERR(in->pdb_getsampwnam(in, samaccount, username))) {
+               fprintf (stderr, "user %s does not exist in the passdb\n", username);
+               return -1;
+       }
+
+       return NT_STATUS_IS_OK(in->pdb_delete_sam_account (in, samaccount));
 }
 
 /*********************************************************
  Delete machine entry
 **********************************************************/
 
-static int delete_machine_entry (char *machinename)
+static int delete_machine_entry (struct pdb_context *in, const char *machinename)
 {
-       char name[16];
+       fstring name;
+       SAM_ACCOUNT *samaccount = NULL;
        
-       safe_strcpy (name, machinename, 16);
-       if (name[strlen(name)] != '$')
-               safe_strcat (name, "$", 16);
-       return pdb_delete_sam_account (name);
+       fstrcpy(name, machinename);
+       name[15] = '\0';
+       if (name[strlen(name)-1] != '$')
+               fstrcat (name, "$");
+
+       if (!NT_STATUS_IS_OK(pdb_init_sam (&samaccount))) {
+               return -1;
+       }
+
+       if (NT_STATUS_IS_ERR(in->pdb_getsampwnam(in, samaccount, name))) {
+               fprintf (stderr, "machine %s does not exist in the passdb\n", name);
+               return -1;
+       }
+
+       return NT_STATUS_IS_OK(in->pdb_delete_sam_account (in, samaccount));
 }
 
 /*********************************************************
- Import smbpasswd style file
+ Start here.
 **********************************************************/
 
-static int import_users (char *filename)
+int main (int argc, char **argv)
 {
-       FILE *fp = NULL;
-       SAM_ACCOUNT *sam_pwent = NULL;
-       static pstring  user_name;
-       static unsigned char smbpwd[16];
-       static unsigned char smbntpwd[16];
-       char linebuf[256];
-       size_t linebuf_len;
-       unsigned char c;
-       unsigned char *p;
-       long uidval;
-       int line = 0;
-       int good = 0;
-
-       if (!pdb_init_sam (&sam_pwent)) {
-               fprintf (stderr, "pdb_init_sam FAILED!\n");
-       }
-
-       if((fp = sys_fopen(filename, "rb")) == NULL) {
-               fprintf (stderr, "%s\n", strerror (ferror (fp)));
-               return -1;
-       }
-       
-       while (!feof(fp)) {
-               /*Get a new line*/
-               linebuf[0] = '\0';
-               fgets(linebuf, 256, fp);
-               if (ferror(fp)) {
-                       fprintf (stderr, "%s\n", strerror (ferror (fp)));
-                       pdb_free_sam(&sam_pwent);
-                       return -1;
-               }
-               if ((linebuf_len = strlen(linebuf)) == 0) {
-                       line++;
-                       continue;
-               }
-               if (linebuf[linebuf_len - 1] != '\n') {
-                       c = '\0';
-                       while (!ferror(fp) && !feof(fp)) {
-                               c = fgetc(fp);
-                               if (c == '\n') break;
-                       }
-               } else
-                       linebuf[linebuf_len - 1] = '\0';
-               linebuf[linebuf_len] = '\0';
-               if ((linebuf[0] == 0) && feof(fp)) {
-                       /*end of file!!*/
-                       pdb_free_sam(&sam_pwent);
-                       return 0;
-               }
-               line++;
-               if (linebuf[0] == '#' || linebuf[0] == '\0')
-                       continue;
-               
-               pdb_set_acct_ctrl (sam_pwent,ACB_NORMAL);
-               
-               /* Get user name */
-               p = (unsigned char *) strchr_m(linebuf, ':');
-               if (p == NULL) {
-                       fprintf (stderr, "Error: malformed password entry at line %d !!\n", line);
-                       pdb_reset_sam (sam_pwent);
-                       continue;
-               }
-               strncpy(user_name, linebuf, PTR_DIFF(p, linebuf));
-               user_name[PTR_DIFF(p, linebuf)] = '\0';
-
-               /* Get smb uid. */
-               p++;
-               if(*p == '-') {
-                       fprintf (stderr, "Error: negative uid at line %d\n", line);
-                       pdb_reset_sam (sam_pwent);
-                       continue;
-               }
-               if (!isdigit(*p)) {
-                       fprintf (stderr, "Error: malformed password entry at line %d (uid not number)\n", line);
-                       pdb_reset_sam (sam_pwent);
-                       continue;
-               }
-               uidval = atoi((char *) p);
-               while (*p && isdigit(*p)) p++;
-               if (*p != ':') {
-                       fprintf (stderr, "Error: malformed password entry at line %d (no : after uid)\n", line);
-                       pdb_reset_sam (sam_pwent);
-                       continue;
+       static BOOL list_users = False;
+       static BOOL verbose = False;
+       static BOOL spstyle = False;
+       static BOOL machine = False;
+       static BOOL add_user = False;
+       static BOOL delete_user = False;
+       static BOOL modify_user = False;
+       uint32  setparms, checkparms;
+       int opt;
+       static char *full_name = NULL;
+       static const char *user_name = NULL;
+       static char *home_dir = NULL;
+       static char *home_drive = NULL;
+       static char *backend = NULL;
+       static char *backend_in = NULL;
+       static char *backend_out = NULL;
+       static BOOL transfer_groups = False;
+       static char *logon_script = NULL;
+       static char *profile_path = NULL;
+       static char *account_control = NULL;
+       static char *account_policy = NULL;
+       static char *user_sid = NULL;
+       static char *group_sid = NULL;
+       static long int account_policy_value = 0;
+       BOOL account_policy_value_set = False;
+
+       struct pdb_context *bin;
+       struct pdb_context *bout;
+       struct pdb_context *bdef;
+       poptContext pc;
+       struct poptOption long_options[] = {
+               POPT_AUTOHELP
+               {"list",        'L', POPT_ARG_NONE, &list_users, 0, "list all users", NULL},
+               {"verbose",     'v', POPT_ARG_NONE, &verbose, 0, "be verbose", NULL },
+               {"smbpasswd-style",     'w',POPT_ARG_NONE, &spstyle, 0, "give output in smbpasswd style", NULL},
+               {"user",        'u', POPT_ARG_STRING, &user_name, 0, "use username", "USER" },
+               {"fullname",    'f', POPT_ARG_STRING, &full_name, 0, "set full name", NULL},
+               {"homedir",     'h', POPT_ARG_STRING, &home_dir, 0, "set home directory", NULL},
+               {"drive",       'D', POPT_ARG_STRING, &home_drive, 0, "set home drive", NULL},
+               {"script",      'S', POPT_ARG_STRING, &logon_script, 0, "set logon script", NULL},
+               {"profile",     'p', POPT_ARG_STRING, &profile_path, 0, "set profile path", NULL},
+               {"user SID",    'U', POPT_ARG_STRING, &user_sid, 0, "set user SID or RID", NULL},
+               {"group SID",   'G', POPT_ARG_STRING, &group_sid, 0, "set group SID or RID", NULL},
+               {"create",      'a', POPT_ARG_NONE, &add_user, 0, "create user", NULL},
+               {"modify",      'r', POPT_ARG_NONE, &modify_user, 0, "modify user", NULL},
+               {"machine",     'm', POPT_ARG_NONE, &machine, 0, "account is a machine account", NULL},
+               {"delete",      'x', POPT_ARG_NONE, &delete_user, 0, "delete user", NULL},
+               {"backend",     'b', POPT_ARG_STRING, &backend, 0, "use different passdb backend as default backend", NULL},
+               {"import",      'i', POPT_ARG_STRING, &backend_in, 0, "import user accounts from this backend", NULL},
+               {"export",      'e', POPT_ARG_STRING, &backend_out, 0, "export user accounts to this backend", NULL},
+               {"group",       'g', POPT_ARG_NONE, &transfer_groups, 0, "use -i and -e for groups", NULL},
+               {"account-policy",      'P', POPT_ARG_STRING, &account_policy, 0,"value of an account policy (like maximum password age)",NULL},
+               {"value",       'C', POPT_ARG_LONG, &account_policy_value, 'C',"set the account policy to this value", NULL},
+               {"account-control",     'c', POPT_ARG_STRING, &account_control, 0, "Values of account control", NULL},
+               POPT_COMMON_SAMBA
+               POPT_TABLEEND
+       };
+       
+       setup_logging("pdbedit", True);
+       
+       pc = poptGetContext(NULL, argc, (const char **) argv, long_options,
+                           POPT_CONTEXT_KEEP_FIRST);
+       
+       while((opt = poptGetNextOpt(pc)) != -1) {
+               switch (opt) {
+               case 'V':
+                       account_policy_value_set = True;
+                       break;
                }
+       }
 
-               pdb_set_username(sam_pwent, user_name);
-               pdb_set_uid (sam_pwent, uidval);
-               
-               /* Get passwords */
-               p++;
-               if (*p == '*' || *p == 'X') {
-                       /* Password deliberately invalid */
-                       fprintf (stderr, "Warning: entry invalidated for user %s\n", user_name);
-                       pdb_set_lanman_passwd(sam_pwent, NULL);
-                       pdb_set_nt_passwd(sam_pwent,NULL);
-                       pdb_set_acct_ctrl(sam_pwent, pdb_get_acct_ctrl(sam_pwent) | ACB_DISABLED);
-               } else {
-                       if (linebuf_len < (PTR_DIFF(p, linebuf) + 33)) {
-                               fprintf (stderr, "Error: malformed password entry at line %d (password too short)\n",line);
-                               pdb_reset_sam (sam_pwent);
-                               continue;
-                       }
-                       if (p[32] != ':') {
-                               fprintf (stderr, "Error: malformed password entry at line %d (no terminating :)\n",line);
-                               pdb_reset_sam (sam_pwent);
-                               continue;
-                       }
-                       if (!strncasecmp((char *) p, "NO PASSWORD", 11)) {
-                               pdb_set_lanman_passwd(sam_pwent, NULL);
-                               pdb_set_acct_ctrl(sam_pwent, pdb_get_acct_ctrl(sam_pwent) | ACB_PWNOTREQ);
-                       } else {
-                               if (!pdb_gethexpwd((char *)p, smbpwd)) {
-                                       fprintf (stderr, "Error: malformed Lanman password entry at line %d (non hex chars)\n", line);
-                                       pdb_reset_sam (sam_pwent);
-                                       continue;
-                               }
-                               pdb_set_lanman_passwd(sam_pwent, smbpwd);
-                       }
-                       /* NT password */
-                       p += 33;
-                       if ((linebuf_len >= (PTR_DIFF(p, linebuf) + 33)) && (p[32] == ':')) {
-                               if (*p != '*' && *p != 'X') {
-                                       if (pdb_gethexpwd((char *)p,smbntpwd)) {
-                                               pdb_set_nt_passwd(sam_pwent, smbntpwd);
-                                       }
-                               }
-                               p += 33;
-                       }
-               }
+       poptGetArg(pc); /* Drop argv[0], the program name */
 
-               /* Get ACCT_CTRL field if any */
-               if (*p == '[') {
-                       uint16 acct_ctrl;
-                       unsigned char *end_p = (unsigned char *)strchr_m((char *)p, ']');
-                       
-                       acct_ctrl = pdb_decode_acct_ctrl((char*)p);
-                       if (acct_ctrl)
-                               acct_ctrl = ACB_NORMAL;
+       if (user_name == NULL)
+               user_name = poptGetArg(pc);
 
-                       pdb_set_acct_ctrl(sam_pwent, acct_ctrl);
-                       
-                       /* Get last change time */
-                       if(end_p)
-                               p = end_p + 1;
-                       if(*p == ':') {
-                               p++;
-                               if(*p && (StrnCaseCmp((char *)p, "LCT-", 4)==0)) {
-                                       int i;
-                                       
-                                       p += 4;
-                                       for(i = 0; i < 8; i++) {
-                                               if(p[i] == '\0' || !isxdigit(p[i])) break;
-                                       }
-                                       if(i == 8) {
-                                                pdb_set_pass_last_set_time (sam_pwent, (time_t)strtol((char *)p, NULL, 16));
-                                       }
-                               }
-                       }
-               }
+       if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+               fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);
+               exit(1);
+       }
 
-               /* Old-style workstation account code droped. */
+       if (!init_names())
+               exit(1);
 
-               if (pdb_get_acct_ctrl(sam_pwent) & ACB_WSTRUST) {
-                       if ((uidval < BASE_MACHINE_UID) || (uidval > MAX_MACHINE_UID)) {
-                               fprintf (stderr, "Warning: Machine UID out of normal range %d-%d\n",
-                                                BASE_MACHINE_UID,
-                                                MAX_MACHINE_UID);
-                       }
-                       pdb_set_uid(sam_pwent, BASE_MACHINE_UID);
+       setparms =      (backend ? BIT_BACKEND : 0) +
+                       (verbose ? BIT_VERBOSE : 0) +
+                       (spstyle ? BIT_SPSTYLE : 0) +
+                       (full_name ? BIT_FULLNAME : 0) +
+                       (home_dir ? BIT_HOMEDIR : 0) +
+                       (home_drive ? BIT_HDIRDRIVE : 0) +
+                       (logon_script ? BIT_LOGSCRIPT : 0) +
+                       (profile_path ? BIT_PROFILE : 0) +
+                       (machine ? BIT_MACHINE : 0) +
+                       (user_name ? BIT_USER : 0) +
+                       (list_users ? BIT_LIST : 0) +
+                       (modify_user ? BIT_MODIFY : 0) +
+                       (add_user ? BIT_CREATE : 0) +
+                       (delete_user ? BIT_DELETE : 0) +
+                       (account_control ? BIT_ACCTCTRL : 0) +
+                       (account_policy ? BIT_ACCPOLICY : 0) +
+                       (account_policy_value_set ? BIT_ACCPOLVAL : 0) +
+                       (backend_in ? BIT_IMPORT : 0) +
+                       (backend_out ? BIT_EXPORT : 0);
+
+       if (setparms & BIT_BACKEND) {
+               if (!NT_STATUS_IS_OK(make_pdb_context_string(&bdef, backend))) {
+                       fprintf(stderr, "Can't initialize passdb backend.\n");
+                       return 1;
+               }
+       } else {
+               if (!NT_STATUS_IS_OK(make_pdb_context_list(&bdef, lp_passdb_backend()))) {
+                       fprintf(stderr, "Can't initialize passdb backend.\n");
+                       return 1;
                }
+       }
        
-               /* Test if user is valid */
-               if (pdb_get_acct_ctrl(sam_pwent) & ACB_NORMAL) {
-                       struct passwd  *pwd = NULL;
+       /* the lowest bit options are always accepted */
+       checkparms = setparms & ~MASK_ALWAYS_GOOD;
 
-                       if (!(pwd = sys_getpwnam(user_name))) {
-                               fprintf (stderr, "Error: User %s does not exist in system passwd!\n", user_name);
-                               continue;
+       /* account policy operations */
+       if ((checkparms & BIT_ACCPOLICY) && !(checkparms & ~(BIT_ACCPOLICY + BIT_ACCPOLVAL))) {
+               uint32 value;
+               int field = account_policy_name_to_fieldnum(account_policy);
+               if (field == 0) {
+                       fprintf(stderr, "No account policy by that name\n");
+                       exit(1);
+               }
+               if (!account_policy_get(field, &value)) {
+                       fprintf(stderr, "valid account policy, but unable to fetch value!\n");
+                       exit(1);
+               }
+               if (account_policy_value_set) {
+                       printf("account policy value for %s was %u\n", account_policy, value);
+                       if (!account_policy_set(field, account_policy_value)) {
+                               fprintf(stderr, "valid account policy, but unable to set value!\n");
+                               exit(1);
                        }
-                       pdb_set_gid(sam_pwent, pwd->pw_gid);
+                       printf("account policy value for %s is now %lu\n", account_policy, account_policy_value);
+                       exit(0);
+               } else {
+                       printf("account policy value for %s is %u\n", account_policy, value);
+                       exit(0);
                }
+       }
 
-               /* Fill in sam_pwent structure */
-               pdb_set_user_rid(sam_pwent, pdb_uid_to_user_rid (pdb_get_uid(sam_pwent)));
-               pdb_set_group_rid(sam_pwent, pdb_gid_to_group_rid (pdb_get_gid(sam_pwent)));
-
-               /* TODO: set also full_name, home_dir, dir_drive, logon_script, profile_path, ecc...
-                * when defaults will be available (after passdb redesign)
-                * let them blank just now they are not used anyway
-                */
-                                        
-                /* Now ADD the entry */
-               if (!(pdb_add_sam_account (sam_pwent))) {
-                       fprintf (stderr, "Unable to add user entry!\n");
-                       pdb_reset_sam (sam_pwent);
-                       continue;
+       /* import and export operations */
+       if (((checkparms & BIT_IMPORT) || (checkparms & BIT_EXPORT))
+                       && !(checkparms & ~(BIT_IMPORT +BIT_EXPORT))) {
+               if (backend_in) {
+                       if (!NT_STATUS_IS_OK(make_pdb_context_string(&bin, backend_in))) {
+                               fprintf(stderr, "Can't initialize passdb backend.\n");
+                               return 1;
+                       }
+               } else {
+                       bin = bdef;
+               }
+               if (backend_out) {
+                       if (!NT_STATUS_IS_OK(make_pdb_context_string(&bout, backend_out))) {
+                               fprintf(stderr, "Can't initialize %s.\n", backend_out);
+                               return 1;
+                       }
+               } else {
+                       bout = bdef;
+               }
+               if (transfer_groups) {
+                       return export_groups(bin, bout);
+               } else {
+                       return export_database(bin, bout);
                }
-               printf ("%s imported!\n", user_name);
-               good++;
-               pdb_reset_sam (sam_pwent);
        }
-       printf ("%d lines read.\n%d entryes imported\n", line, good);
-       pdb_free_sam(&sam_pwent);       
-       return 0;
-}
-
-/*********************************************************
- Start here.
-**********************************************************/
-
-int main (int argc, char **argv)
-{
-       int ch;
-       static pstring servicesf = CONFIGFILE;
-       BOOL list_users = False;
-       BOOL verbose = False;
-       BOOL spstyle = False;
-       BOOL setparms = False;
-       BOOL machine = False;
-       BOOL add_user = False;
-       BOOL delete_user = False;
-       BOOL import = False;
-       char *user_name = NULL;
-       char *full_name = NULL;
-       char *home_dir = NULL;
-       char *home_drive = NULL;
-       char *logon_script = NULL;
-       char *profile_path = NULL;
-       char *smbpasswd = NULL;
-
-       TimeInit();
-       
-       setup_logging("tdbedit", True);
 
-       if (argc < 2) {
-               usage();
-               return 0;
+       /* if BIT_USER is defined but nothing else then threat it as -l -u for compatibility */
+       /* fake up BIT_LIST if only BIT_USER is defined */
+       if ((checkparms & BIT_USER) && !(checkparms & ~BIT_USER)) {
+               checkparms += BIT_LIST;
        }
        
-       if(!initialize_password_db(True)) {
-               fprintf(stderr, "Can't setup password database vectors.\n");
-               exit(1);
+       /* modify flag is optional to maintain backwards compatibility */
+       /* fake up BIT_MODIFY if BIT_USER  and at least one of MASK_USER_GOOD is defined */
+       if (!((checkparms & ~MASK_USER_GOOD) & ~BIT_USER) && (checkparms & MASK_USER_GOOD)) {
+               checkparms += BIT_MODIFY;
        }
-       
-       if (!lp_load(servicesf,True,False,False)) {
-               fprintf(stderr, "Can't load %s - run testparm to debug it\n", 
-                       servicesf);
-               exit(1);
-       }
-       
-       while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwx")) != EOF) {
-               switch(ch) {
-               case 'a':
-                       add_user = True;
-                       break;
-               case 'm':
-                       machine = True;
-                       break;
-               case 'l':
-                       list_users = True;
-                       break;
-               case 'v':
-                       verbose = True;
-                       break;
-               case 'w':
-                       spstyle = True;
-                       break;
-               case 'u':
-                       user_name = optarg;
-                       break;
-               case 'f':
-                       setparms = True;
-                       full_name = optarg;
-                       break;
-               case 'h':
-                       setparms = True;
-                       home_dir = optarg;
-                       break;
-               case 'd':
-                       setparms = True;
-                       home_drive = optarg;
-                       break;
-               case 's':
-                       setparms = True;
-                       logon_script = optarg;
-                       break;
-               case 'p':
-                       setparms = True;
-                       profile_path = optarg;
-                       break;
-               case 'x':
-                       delete_user = True;
-                       break;
-               case 'i':
-                       import = True;
-                       smbpasswd = optarg;
-                       break;
-               default:
-                       usage();
+
+       /* list users operations */
+       if (checkparms & BIT_LIST) {
+               if (!(checkparms & ~BIT_LIST)) {
+                       return print_users_list (bdef, verbose, spstyle);
+               }
+               if (!(checkparms & ~(BIT_USER + BIT_LIST))) {
+                       return print_user_info (bdef, user_name, verbose, spstyle);
                }
        }
-       if (((add_user?1:0) + (delete_user?1:0) + (list_users?1:0) + (import?1:0) + (setparms?1:0)) > 1) {
-               fprintf (stderr, "Incompatible options on command line!\n");
-               usage();
-               exit(1);
-       }
-
-       if (add_user) {
-               if (!user_name) {
+       
+       /* mask out users options */
+       checkparms &= ~MASK_USER_GOOD;
+       
+       /* account operation */
+       if ((checkparms & BIT_CREATE) || (checkparms & BIT_MODIFY) || (checkparms & BIT_DELETE)) {
+               /* check use of -u option */
+               if (!(checkparms & BIT_USER)) {
                        fprintf (stderr, "Username not specified! (use -u option)\n");
                        return -1;
                }
-               if (machine)
-                       return new_machine (user_name);
-               else
-                       return new_user (user_name, full_name, home_dir, home_drive, logon_script, profile_path);
-       }
 
-       if (delete_user) {
-               if (!user_name) {
-                       fprintf (stderr, "Username not specified! (use -u option)\n");
-                       return -1;
+               /* account creation operations */
+               if (!(checkparms & ~(BIT_CREATE + BIT_USER + BIT_MACHINE))) {
+                       if (checkparms & BIT_MACHINE) {
+                               return new_machine (bdef, user_name);
+                       } else {
+                               return new_user (bdef, user_name, full_name, home_dir, 
+                                                home_drive, logon_script, 
+                                                profile_path, user_sid, group_sid);
+                       }
+               }
+
+               /* account deletion operations */
+               if (!(checkparms & ~(BIT_DELETE + BIT_USER + BIT_MACHINE))) {
+                       if (checkparms & BIT_MACHINE) {
+                               return delete_machine_entry (bdef, user_name);
+                       } else {
+                               return delete_user_entry (bdef, user_name);
+                       }
+               }
+
+               /* account modification operations */
+               if (!(checkparms & ~(BIT_MODIFY + BIT_USER))) {
+                       return set_user_info (bdef, user_name, full_name,
+                                             home_dir,
+                                             home_drive,
+                                             logon_script,
+                                             profile_path, account_control,
+                                             user_sid, group_sid);
                }
-               if (machine)
-                       return delete_machine_entry (user_name);
-               else
-                       return delete_user_entry (user_name);
-       }
-       
-       if (user_name) {
-               if (setparms)
-                       set_user_info ( user_name, full_name,
-                                               home_dir,
-                                               home_drive,
-                                               logon_script,
-                                               profile_path);
-               else
-                       return print_user_info (user_name, verbose, spstyle);
-               
-               return 0;
        }
 
-       
-       if (list_users) 
-               return print_users_list (verbose, spstyle);
-       
-       if (import) 
-               return import_users (smbpasswd); 
-       
-       usage();
+       if (setparms >= 0x20) {
+               fprintf (stderr, "Incompatible or insufficient options on command line!\n");
+       }
+       poptPrintHelp(pc, stderr, 0);
 
-       return 0;
+       return 1;
 }