-/*
- * Unix SMB/Netbios implementation. Version 1.9. tdbedit module. Copyright
- * (C) Simo Sorce 2000
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software 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?
- */
-
-#define BASE_MACHINE_UID 60000
-#define MAX_MACHINE_UID 65500 /* 5500 trust acconts aren't enough? */
+/*
+ Unix SMB/CIFS implementation.
+ passdb editing frontend
+
+ Copyright (C) Simo Sorce 2000
+ Copyright (C) Andrew Bartlett 2001
+
+ 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
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
#include "includes.h"
extern pstring global_myname;
-extern int DEBUGLEVEL;
+extern BOOL AllowDebugChange;
/*
* Next two lines needed for SunOS and don't
static void usage(void)
{
if (getuid() == 0) {
- printf("tdbedit options\n");
+ printf("pdbedit 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(" -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(" -m it is a machine trust\n");
printf(" -x delete this user\n");
printf(" -i file import account from file (smbpasswd style)\n");
+ printf(" -D debuglevel set DEBUGELEVEL (default = 1)\n");
exit(1);
}
+
/*********************************************************
Print info from sam structure
**********************************************************/
+
static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdstyle)
{
+ uid_t uid;
+ gid_t gid;
+
/* 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);
- }
- else if (smbpwdstyle)
- {
- char lm_passwd[33];
- char nt_passwd[33];
- pdb_gethexpwd(pdb_get_lanman_passwd(sam_pwent), lm_passwd);
- pdb_gethexpwd(pdb_get_nt_passwd(sam_pwent), nt_passwd);
-
- 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));
+ if (verbosity) {
+ printf ("username: %s\n", pdb_get_username(sam_pwent));
+ if (IS_SAM_UNIX_USER(sam_pwent)) {
+ uid = pdb_get_uid(sam_pwent);
+ gid = pdb_get_gid(sam_pwent);
+ printf ("user ID/Group: %d/%d\n", uid, gid);
+ }
+ printf ("user RID/GRID: %u/%u\n", (unsigned int)pdb_get_user_rid(sam_pwent),
+ (unsigned int)pdb_get_group_rid(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_dirdrive(sam_pwent));
+ printf ("Logon Script: %s\n", pdb_get_logon_script(sam_pwent));
+ printf ("Profile Path: %s\n", pdb_get_profile_path(sam_pwent));
+ } else if (smbpwdstyle) {
+ if (IS_SAM_UNIX_USER(sam_pwent)) {
+ char lm_passwd[33];
+ char nt_passwd[33];
+
+ uid = pdb_get_uid(sam_pwent);
+ 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),
+ 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 {
+ fprintf(stderr, "Can't output in smbpasswd format, no uid on this record.\n");
+ }
+ } else {
+ if (IS_SAM_UNIX_USER(sam_pwent)) {
+ printf ("%s:%d:%s\n", pdb_get_username(sam_pwent), pdb_get_uid(sam_pwent),
+ pdb_get_fullname(sam_pwent));
+ } else {
+ printf ("%s:(null):%s\n", pdb_get_username(sam_pwent), pdb_get_fullname(sam_pwent));
+ }
}
- else
- {
- printf ("%s:%d:%s\n", sam_pwent->username, sam_pwent->uid, sam_pwent->full_name);
- }
-
+
return 0;
}
/*********************************************************
Get an Print User Info
**********************************************************/
+
static int print_user_info (char *username, BOOL verbosity, BOOL smbpwdstyle)
{
- SAM_ACCOUNT *sam_pwent;
+ SAM_ACCOUNT *sam_pwent=NULL;
+ BOOL ret;
+
+ pdb_init_sam(&sam_pwent);
+
+ ret = pdb_getsampwnam (sam_pwent, username);
+
+ if (ret==False) {
+ fprintf (stderr, "Username not found!\n");
+ pdb_free_sam(&sam_pwent);
+ return -1;
+ }
+
+ ret=print_sam_info (sam_pwent, verbosity, smbpwdstyle);
+ pdb_free_sam(&sam_pwent);
- sam_pwent = pdb_getsampwnam (username);
- if (sam_pwent) return print_sam_info (sam_pwent, verbosity, smbpwdstyle);
- else fprintf (stderr, "Username not found!\n");
- return -1;
+ return ret;
}
/*********************************************************
**********************************************************/
static int print_users_list (BOOL verbosity, BOOL smbpwdstyle)
{
- SAM_ACCOUNT *sam_pwent;
+ SAM_ACCOUNT *sam_pwent=NULL;
BOOL ret;
+ pdb_init_sam(&sam_pwent);
+ errno = 0; /* testing --simo */
ret = pdb_setsampwent(False);
if (ret && errno == ENOENT) {
fprintf (stderr,"Password database not found!\n");
exit(1);
}
+ pdb_free_sam(&sam_pwent);
- while ((sam_pwent = pdb_getsampwent ()))
- {
- if (verbosity) printf ("---------------\n");
+ while ((NT_STATUS_IS_OK(pdb_init_sam(&sam_pwent))
+ && (ret = pdb_getsampwent (sam_pwent)))) {
+ if (verbosity)
+ printf ("---------------\n");
print_sam_info (sam_pwent, verbosity, smbpwdstyle);
+ pdb_free_sam(&sam_pwent);
}
+ pdb_free_sam(&sam_pwent);
pdb_endsampwent ();
return 0;
/*********************************************************
Set User Info
**********************************************************/
+
static int set_user_info (char *username, char *fullname, char *homedir, char *drive, char *script, char *profile)
{
- SAM_ACCOUNT *sam_pwent;
+ SAM_ACCOUNT *sam_pwent=NULL;
+ BOOL ret;
- sam_pwent = pdb_getsampwnam (username);
- if (!sam_pwent)
- {
+ pdb_init_sam(&sam_pwent);
+
+ ret = pdb_getsampwnam (sam_pwent, username);
+ if (ret==False) {
fprintf (stderr, "Username not found!\n");
+ pdb_free_sam(&sam_pwent);
return -1;
}
- if (fullname) sam_pwent->full_name = fullname;
- if (homedir) sam_pwent->home_dir = homedir;
- if (drive) sam_pwent->dir_drive = drive;
- if (script) sam_pwent->logon_script = script;
- if (profile) sam_pwent->profile_path = profile;
+ if (fullname)
+ pdb_set_fullname(sam_pwent, fullname);
+ if (homedir)
+ pdb_set_homedir(sam_pwent, homedir, True);
+ if (drive)
+ pdb_set_dir_drive(sam_pwent,drive, True);
+ if (script)
+ pdb_set_logon_script(sam_pwent, script, True);
+ if (profile)
+ pdb_set_profile_path (sam_pwent, profile, True);
- if (pdb_update_sam_account (sam_pwent, TRUE)) print_user_info (username, TRUE, FALSE);
- else
- {
+ if (pdb_update_sam_account (sam_pwent))
+ print_user_info (username, True, False);
+ else {
fprintf (stderr, "Unable to modify entry!\n");
+ pdb_free_sam(&sam_pwent);
return -1;
}
+ pdb_free_sam(&sam_pwent);
return 0;
}
**********************************************************/
static int new_user (char *username, char *fullname, char *homedir, char *drive, char *script, char *profile)
{
- SAM_ACCOUNT sam_pwent;
+ SAM_ACCOUNT *sam_pwent=NULL;
struct passwd *pwd = NULL;
- uchar new_p16[16];
- uchar new_nt_p16[16];
char *password1, *password2;
- if (pdb_getsampwnam (username))
- {
- fprintf (stderr, "Username already exist in database!\n");
- return -1;
- }
+ ZERO_STRUCT(sam_pwent);
- if (!(pwd = sys_getpwnam(username)))
- {
- fprintf (stderr, "User %s does not exist in system passwd!\n", username);
- return -1;
+ if ((pwd = getpwnam_alloc(username))) {
+ pdb_init_sam_pw (&sam_pwent, pwd);
+ passwd_free(&pwd);
+ } else {
+ fprintf (stderr, "WARNING: user %s does not exist in system passwd\n", username);
+ pdb_init_sam(&sam_pwent);
+ if (!pdb_set_username(sam_pwent, username)) {
+ return False;
+ }
}
-
+
password1 = getpass("new password:");
password2 = getpass("retype new password:");
- if (strcmp (password1, password2))
- {
+ if (strcmp (password1, password2)) {
fprintf (stderr, "Passwords does not match!\n");
+ pdb_free_sam (&sam_pwent);
return -1;
}
- nt_lm_owf_gen (password1, new_nt_p16, new_p16);
-
- sam_pwent.username = username;
- if (fullname) sam_pwent.full_name = fullname;
- if (homedir) sam_pwent.home_dir = homedir;
- if (drive) sam_pwent.dir_drive = drive;
- if (script) sam_pwent.logon_script = script;
- if (profile) sam_pwent.profile_path = profile;
+
+ pdb_set_plaintext_passwd(sam_pwent, password1);
+
+ if (fullname)
+ pdb_set_fullname(sam_pwent, fullname);
+ if (homedir)
+ pdb_set_homedir (sam_pwent, homedir, True);
+ if (drive)
+ pdb_set_dir_drive (sam_pwent, drive, True);
+ if (script)
+ pdb_set_logon_script(sam_pwent, script, True);
+ if (profile)
+ pdb_set_profile_path (sam_pwent, profile, True);
- /* TODO: Check uid not being in MACHINE UID range!! */
- sam_pwent.uid = pwd->pw_uid;
- sam_pwent.gid = pwd->pw_gid;
- sam_pwent.user_rid = pdb_uid_to_user_rid (pwd->pw_uid);
- sam_pwent.group_rid = pdb_gid_to_group_rid (pwd->pw_gid);
- sam_pwent.lm_pw = new_p16;
- sam_pwent.nt_pw = new_nt_p16;
- sam_pwent.acct_ctrl = ACB_NORMAL;
+ pdb_set_acct_ctrl (sam_pwent, ACB_NORMAL);
- if (pdb_add_sam_account (&sam_pwent)) print_user_info (username, TRUE, FALSE);
- else
- {
- fprintf (stderr, "Unable to add user!\n");
+ if (pdb_add_sam_account (sam_pwent)) {
+ print_user_info (username, True, False);
+ } else {
+ fprintf (stderr, "Unable to add user! (does it alredy exist?)\n");
+ pdb_free_sam (&sam_pwent);
return -1;
}
+ pdb_free_sam (&sam_pwent);
return 0;
}
/*********************************************************
Add New Machine
**********************************************************/
+
static int new_machine (char *machinename)
{
- SAM_ACCOUNT sam_pwent;
- uchar new_p16[16];
- uchar new_nt_p16[16];
+ SAM_ACCOUNT *sam_pwent=NULL;
char name[16];
char *password = NULL;
- uid_t uid;
+
+ pdb_init_sam (&sam_pwent);
- if (machinename[strlen (machinename) -1] == '$') machinename[strlen (machinename) -1] = '\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(password);
- nt_lm_owf_gen (password, new_nt_p16, new_p16);
+ strlower_m(password);
- sam_pwent.username = name;
+ pdb_set_plaintext_passwd (sam_pwent, password);
- for (uid=BASE_MACHINE_UID; uid<=MAX_MACHINE_UID; uid++) if (!(pdb_getsampwuid (uid))) break;
- if (uid>MAX_MACHINE_UID)
- {
- fprintf (stderr, "No more free UIDs available to Machine accounts!\n");
- return -1;
- }
- sam_pwent.uid = uid;
- sam_pwent.gid = BASE_MACHINE_UID; /* TODO: set there more appropriate value!! */
- sam_pwent.user_rid = pdb_uid_to_user_rid (uid);
- sam_pwent.group_rid = pdb_gid_to_group_rid (BASE_MACHINE_UID);
- sam_pwent.lm_pw = new_p16;
- sam_pwent.nt_pw = new_nt_p16;
- sam_pwent.acct_ctrl = ACB_WSTRUST;
+ pdb_set_username (sam_pwent, name);
+
+ pdb_set_acct_ctrl (sam_pwent, ACB_WSTRUST);
- if (pdb_add_sam_account (&sam_pwent)) print_user_info (name, TRUE, FALSE);
- else
- {
- fprintf (stderr, "Unable to add machine!\n");
+ if (pdb_add_sam_account (sam_pwent)) {
+ print_user_info (name, True, False);
+ } else {
+ fprintf (stderr, "Unable to add machine! (does it already exist?)\n");
+ pdb_free_sam (&sam_pwent);
return -1;
}
+ pdb_free_sam (&sam_pwent);
return 0;
}
/*********************************************************
Delete user entry
**********************************************************/
+
static int delete_user_entry (char *username)
{
- return pdb_delete_sam_account (username);
+ SAM_ACCOUNT *samaccount;
+
+ pdb_init_sam(&samaccount);
+
+ if (!pdb_getsampwnam(samaccount, username)) {
+ fprintf (stderr, "user %s does not exist in the passdb\n", username);
+ return -1;
+ }
+
+ return pdb_delete_sam_account (samaccount);
}
/*********************************************************
Delete machine entry
**********************************************************/
+
static int delete_machine_entry (char *machinename)
{
char name[16];
+ SAM_ACCOUNT *samaccount;
safe_strcpy (name, machinename, 16);
if (name[strlen(name)] != '$')
- {
safe_strcat (name, "$", 16);
+
+ pdb_init_sam(&samaccount);
+
+ if (!pdb_getsampwnam(samaccount, name)) {
+ fprintf (stderr, "user %s does not exist in the passdb\n", name);
+ return -1;
}
- return pdb_delete_sam_account (name);
+
+ return pdb_delete_sam_account (samaccount);
}
/*********************************************************
Import smbpasswd style file
**********************************************************/
+
static int import_users (char *filename)
{
FILE *fp = NULL;
- SAM_ACCOUNT sam_pwent;
+ SAM_ACCOUNT *sam_pwent = NULL;
static pstring user_name;
static unsigned char smbpwd[16];
static unsigned char smbntpwd[16];
long uidval;
int line = 0;
int good = 0;
+ struct passwd *pwd;
- if((fp = sys_fopen(filename, "rb")) == NULL)
- {
+ if((fp = sys_fopen(filename, "rb")) == NULL) {
fprintf (stderr, "%s\n", strerror (ferror (fp)));
return -1;
}
- while (!feof(fp))
- {
+ while (!feof(fp)) {
/*Get a new line*/
linebuf[0] = '\0';
fgets(linebuf, 256, fp);
- if (ferror(fp))
- {
+ if (ferror(fp)) {
fprintf (stderr, "%s\n", strerror (ferror (fp)));
return -1;
}
- if ((linebuf_len = strlen(linebuf)) == 0)
- {
+ if ((linebuf_len = strlen(linebuf)) == 0) {
line++;
continue;
}
- if (linebuf[linebuf_len - 1] != '\n')
- {
+ if (linebuf[linebuf_len - 1] != '\n') {
c = '\0';
- while (!ferror(fp) && !feof(fp))
- {
+ while (!ferror(fp) && !feof(fp)) {
c = fgetc(fp);
if (c == '\n') break;
}
- }
- else linebuf[linebuf_len - 1] = '\0';
+ } else
+ linebuf[linebuf_len - 1] = '\0';
linebuf[linebuf_len] = '\0';
- if ((linebuf[0] == 0) && feof(fp))
- {
+ if ((linebuf[0] == 0) && feof(fp)) {
/*end of file!!*/
return 0;
}
line++;
- if (linebuf[0] == '#' || linebuf[0] == '\0') continue;
-
- pdb_init_sam (&sam_pwent);
- sam_pwent.acct_ctrl = ACB_NORMAL;
+ if (linebuf[0] == '#' || linebuf[0] == '\0')
+ continue;
/* Get user name */
- p = (unsigned char *) strchr(linebuf, ':');
- if (p == NULL)
- {
+ p = (unsigned char *) strchr_m(linebuf, ':');
+ if (p == NULL) {
fprintf (stderr, "Error: malformed password entry at line %d !!\n", line);
continue;
}
/* Get smb uid. */
p++;
- if(*p == '-')
- {
+ if(*p == '-') {
fprintf (stderr, "Error: negative uid at line %d\n", line);
continue;
}
- if (!isdigit(*p))
- {
+ if (!isdigit(*p)) {
fprintf (stderr, "Error: malformed password entry at line %d (uid not number)\n", line);
continue;
}
uidval = atoi((char *) p);
while (*p && isdigit(*p)) p++;
- if (*p != ':')
- {
+ if (*p != ':') {
fprintf (stderr, "Error: malformed password entry at line %d (no : after uid)\n", line);
continue;
}
+ if(!(pwd = sys_getpwnam(user_name))) {
+ fprintf(stderr, "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;
+ }
+
+ if (!NT_STATUS_IS_OK(pdb_init_sam_pw(&sam_pwent, pwd))) {
+ fprintf(stderr, "Failed initialise SAM_ACCOUNT for user %s.\n", user_name);
+ return False;
+ }
- sam_pwent.username = user_name;
- sam_pwent.uid = uidval;
-
/* Get passwords */
p++;
- if (*p == '*' || *p == 'X')
- {
+ if (*p == '*' || *p == 'X') {
/* Password deliberately invalid */
fprintf (stderr, "Warning: entry invalidated for user %s\n", user_name);
- sam_pwent.lm_pw = NULL;
- sam_pwent.nt_pw = NULL;
- sam_pwent.acct_ctrl |= ACB_DISABLED;
- }
- else
- {
- if (linebuf_len < (PTR_DIFF(p, linebuf) + 33))
- {
+ 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_free_sam (&sam_pwent);
continue;
}
- if (p[32] != ':')
- {
+ if (p[32] != ':') {
fprintf (stderr, "Error: malformed password entry at line %d (no terminating :)\n",line);
+ pdb_free_sam (&sam_pwent);
continue;
}
- if (!strncasecmp((char *) p, "NO PASSWORD", 11))
- {
- sam_pwent.lm_pw = NULL;
- sam_pwent.acct_ctrl |= ACB_PWNOTREQ;
- }
- else
- {
- if (!pdb_gethexpwd((char *)p, smbpwd))
- {
+ 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_free_sam (&sam_pwent);
continue;
}
- sam_pwent.lm_pw = smbpwd;
+ pdb_set_lanman_passwd(sam_pwent, smbpwd);
}
/* NT password */
- sam_pwent.nt_pw = NULL;
p += 33;
- if ((linebuf_len >= (PTR_DIFF(p, linebuf) + 33)) && (p[32] == ':'))
- {
- if (*p != '*' && *p != 'X')
- {
- if (pdb_gethexpwd((char *)p,smbntpwd))
- {
- sam_pwent.nt_pw = smbntpwd;
+ 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;
}
/* Get ACCT_CTRL field if any */
- if (*p == '[')
- {
- unsigned char *end_p = (unsigned char *)strchr((char *)p, ']');
+ if (*p == '[') {
+ uint16 acct_ctrl;
+ unsigned char *end_p = (unsigned char *)strchr_m((char *)p, ']');
- sam_pwent.acct_ctrl = pdb_decode_acct_ctrl((char*)p);
- if(sam_pwent.acct_ctrl == 0) sam_pwent.acct_ctrl = ACB_NORMAL;
+ acct_ctrl = pdb_decode_acct_ctrl((char*)p);
+ if (acct_ctrl)
+ acct_ctrl = ACB_NORMAL;
+
+ pdb_set_acct_ctrl(sam_pwent, acct_ctrl);
/* Get last change time */
- if(end_p) p = end_p + 1;
- if(*p == ':')
- {
+ if(end_p)
+ p = end_p + 1;
+ if(*p == ':') {
p++;
- if(*p && (StrnCaseCmp((char *)p, "LCT-", 4)==0))
- {
+ if(*p && (StrnCaseCmp((char *)p, "LCT-", 4)==0)) {
int i;
p += 4;
- for(i = 0; i < 8; i++)
- {
+ for(i = 0; i < 8; i++) {
if(p[i] == '\0' || !isxdigit(p[i])) break;
}
- if(i == 8)
- {
- sam_pwent.pass_last_set_time = (time_t)strtol((char *)p, NULL, 16);
+ if(i == 8) {
+ pdb_set_pass_last_set_time (sam_pwent, (time_t)strtol((char *)p, NULL, 16));
}
}
}
}
- /* Test if workstation */
- else
- {
- if(sam_pwent.username[strlen(sam_pwent.username) - 1] == '$')
- {
- sam_pwent.acct_ctrl &= ~ACB_NORMAL;
- sam_pwent.acct_ctrl |= ACB_WSTRUST;
- }
- }
- if (sam_pwent.acct_ctrl & ACB_WSTRUST)
- {
- if (!(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);
- }
- sam_pwent.gid = BASE_MACHINE_UID;
- }
-
- /* Test if user is valid */
- if (sam_pwent.acct_ctrl & ACB_NORMAL)
- {
- struct passwd *pwd = NULL;
-
- if (pdb_getsampwnam (user_name))
- {
- fprintf (stderr, "Error: Username already exist in database!\n");
- continue;
- }
- if (!(pwd = sys_getpwnam(user_name)))
- {
- fprintf (stderr, "Error: User %s does not exist in system passwd!\n", user_name);
- continue;
- }
- sam_pwent.gid = pwd->pw_gid;
- }
-
- /* Fill in sam_pwent structure */
- sam_pwent.user_rid = pdb_uid_to_user_rid (sam_pwent.uid);
- sam_pwent.group_rid = pdb_gid_to_group_rid (sam_pwent.gid);
- /* 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)))
- {
+ if (!(pdb_add_sam_account (sam_pwent))) {
fprintf (stderr, "Unable to add user entry!\n");
+ pdb_free_sam (&sam_pwent);
continue;
}
printf ("%s imported!\n", user_name);
good++;
+ pdb_free_sam (&sam_pwent);
}
printf ("%d lines read.\n%d entryes imported\n", line, good);
-
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;
+ 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 *profile_path = NULL;
char *smbpasswd = NULL;
- TimeInit();
-
- setup_logging("tdbedit", True);
-
- charset_initialise();
-
- if (argc < 2)
+ setup_logging("pdbedit", True);
- {
+ if (argc < 2) {
usage();
return 0;
}
- if(!initialize_password_db(True)) {
- fprintf(stderr, "Can't setup password database vectors.\n");
+ DEBUGLEVEL = 1;
+ AllowDebugChange = False;
+
+ if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
+ fprintf(stderr, "Can't load %s - run testparm to debug it\n",
+ dyn_CONFIGFILE);
exit(1);
}
- if (!lp_load(servicesf,True,False,False)) {
- fprintf(stderr, "Can't load %s - run testparm to debug it\n",
- servicesf);
+ if(!initialize_password_db(True)) {
+ fprintf(stderr, "Can't setup password database vectors.\n");
exit(1);
}
- while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwx")) != EOF) {
+ while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwxD:")) != EOF) {
switch(ch) {
case 'a':
- add_user = TRUE;
+ add_user = True;
break;
case 'm':
- machine = TRUE;
+ machine = True;
break;
case 'l':
- list_users = TRUE;
+ list_users = True;
break;
case 'v':
- verbose = TRUE;
+ verbose = True;
break;
case 'w':
- spstyle = TRUE;
+ spstyle = True;
break;
case 'u':
user_name = optarg;
break;
case 'f':
- setparms = TRUE;
+ setparms = True;
full_name = optarg;
break;
case 'h':
- setparms = TRUE;
+ setparms = True;
home_dir = optarg;
break;
case 'd':
- setparms = TRUE;
+ setparms = True;
home_drive = optarg;
break;
case 's':
- setparms = TRUE;
+ setparms = True;
logon_script = optarg;
break;
case 'p':
- setparms = TRUE;
+ setparms = True;
profile_path = optarg;
break;
case 'x':
- delete_user = TRUE;
+ delete_user = True;
break;
case 'i':
- import = TRUE;
+ import = True;
smbpasswd = optarg;
break;
+ case 'D':
+ DEBUGLEVEL = atoi(optarg);
+ break;
default:
usage();
}
}
- if (((add_user?1:0) + (delete_user?1:0) + (list_users?1:0) + (import?1:0) + (setparms?1:0)) > 1)
- {
+ 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)
- {
+ if (add_user) {
+ if (!user_name) {
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 (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)
- {
+ if (delete_user) {
+ if (!user_name) {
fprintf (stderr, "Username not specified! (use -u option)\n");
return -1;
}
- if (machine) return delete_machine_entry (user_name);
- else return delete_user_entry (user_name);
+ 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,
+ 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);
+ else
+ return print_user_info (user_name, verbose, spstyle);
return 0;
}
return 0;
}
-
-
git.samba.org / kai / samba.git / blobdiff