diff options
| -rw-r--r-- | source3/utils/pdbedit.c | 265 |
1 files changed, 71 insertions, 194 deletions
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c index e80143cc2b..90c50d7e9f 100644 --- a/source3/utils/pdbedit.c +++ b/source3/utils/pdbedit.c @@ -42,7 +42,7 @@ extern int optind; /********************************************************* Print command usage on stderr and die. - **********************************************************/ +**********************************************************/ static void usage(void) { if (getuid() == 0) { @@ -74,23 +74,32 @@ static void usage(void) 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); + 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)sam_pwent->user_rid, + (unsigned int)sam_pwent->group_rid); + 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)); @@ -100,13 +109,21 @@ static int print_sam_info (SAM_ACCOUNT *sam_pwent, BOOL verbosity, BOOL smbpwdst printf("%s:%d:%s:%s:%s:LCT-%08X:\n", pdb_get_username(sam_pwent), - pdb_get_uid(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); + 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)); + } } return 0; @@ -146,7 +163,7 @@ static int print_users_list (BOOL verbosity, BOOL smbpwdstyle) 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"); @@ -189,7 +206,7 @@ static int set_user_info (char *username, char *fullname, char *homedir, char *d if (homedir) pdb_set_homedir(sam_pwent, homedir, True); if (drive) - pdb_set_dir_drive(sam_pwent, drive, True); + pdb_set_dir_drive(sam_pwent,drive, True); if (script) pdb_set_logon_script(sam_pwent, script, True); if (profile) @@ -207,117 +224,32 @@ static int set_user_info (char *username, char *fullname, char *homedir, char *d } /********************************************************* - A strdup with exit -**********************************************************/ - -static char *strdup_x(const char *s) -{ - char *new_s = strdup(s); - if (!new_s) { - fprintf(stderr,"out of memory\n"); - exit(1); - } - return new_s; -} - -/************************************************************* - Utility function to prompt for passwords from stdin. Each - password entered must end with a newline. -*************************************************************/ -static char *stdin_new_passwd(void) -{ - static fstring new_passwd; - size_t len; - - ZERO_ARRAY(new_passwd); - - /* - * if no error is reported from fgets() and string at least contains - * the newline that ends the password, then replace the newline with - * a null terminator. - */ - if ( fgets(new_passwd, sizeof(new_passwd), stdin) != NULL) { - if ((len = strlen(new_passwd)) > 0) { - if(new_passwd[len-1] == '\n') - new_passwd[len - 1] = 0; - } - } - return(new_passwd); -} - -/************************************************************* - Utility function to get passwords via tty or stdin - Used if the '-s' option is set to silently get passwords - to enable scripting. - _copied_ from smbpasswd -*************************************************************/ -static char *get_pass( char *prompt, BOOL stdin_get) -{ - char *p; - if (stdin_get) { - p = stdin_new_passwd(); - } else { - p = getpass(prompt); - } - return strdup_x(p); -} - -/************************************************************* - Utility function to prompt for new password. - _copied_ from smbpasswd -*************************************************************/ -static char *prompt_for_new_password(BOOL stdin_get) -{ - char *p; - fstring new_passwd; - - ZERO_ARRAY(new_passwd); - - p = get_pass("New SMB password:", stdin_get); - - fstrcpy(new_passwd, p); - safe_free(p); - - p = get_pass("Retype new SMB password:", stdin_get); - - if (strcmp(p, new_passwd)) { - fprintf(stderr, "Mismatch - password unchanged.\n"); - ZERO_ARRAY(new_passwd); - safe_free(p); - return NULL; - } - - return p; -} - - -/********************************************************* Add New User **********************************************************/ static int new_user (char *username, char *fullname, char *homedir, char *drive, char *script, char *profile) { SAM_ACCOUNT *sam_pwent=NULL; struct passwd *pwd = NULL; - char *password; + char *password1, *password2; 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); return -1; } - password = prompt_for_new_password(0); - if (!password) { - fprintf (stderr, "Passwords do not match!\n"); - pdb_free_sam(&sam_pwent); + pdb_init_sam_pw (&sam_pwent, pwd); + + password1 = getpass("new password:"); + password2 = getpass("retype new password:"); + if (strcmp (password1, password2)) { + fprintf (stderr, "Passwords does not match!\n"); + pdb_free_sam (&sam_pwent); return -1; } - pdb_set_plaintext_passwd(sam_pwent, password); + pdb_set_plaintext_passwd(sam_pwent, password1); pdb_set_username(sam_pwent, username); if (fullname) @@ -331,22 +263,16 @@ static int new_user (char *username, char *fullname, char *homedir, char *drive, if (profile) pdb_set_profile_path (sam_pwent, profile, True); - /* 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); 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); + pdb_free_sam (&sam_pwent); return -1; } - pdb_free_sam(&sam_pwent); + pdb_free_sam (&sam_pwent); return 0; } @@ -371,7 +297,7 @@ static int new_machine (char *machinename) safe_strcat (name, "$", 16); string_set (&password, machinename); - strlower(password); + strlower_m(password); pdb_set_plaintext_passwd (sam_pwent, password); @@ -379,8 +305,8 @@ static int new_machine (char *machinename) 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); + if (pdb_getsampwrid (sam_trust, pdb_uid_to_user_rid (uid))) { + pdb_free_sam (&sam_trust); } else { break; } @@ -392,8 +318,6 @@ static int new_machine (char *machinename) return -1; } - 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); @@ -402,10 +326,10 @@ static int new_machine (char *machinename) print_user_info (name, True, False); } else { fprintf (stderr, "Unable to add machine! (does it already exist?)\n"); - pdb_free_sam(&sam_pwent); + pdb_free_sam (&sam_pwent); return -1; } - pdb_free_sam(&sam_pwent); + pdb_free_sam (&sam_pwent); return 0; } @@ -450,10 +374,7 @@ static int import_users (char *filename) long uidval; int line = 0; int good = 0; - - if (!pdb_init_sam (&sam_pwent)) { - fprintf (stderr, "pdb_init_sam FAILED!\n"); - } + struct passwd *pwd; if((fp = sys_fopen(filename, "rb")) == NULL) { fprintf (stderr, "%s\n", strerror (ferror (fp))); @@ -466,7 +387,6 @@ static int import_users (char *filename) 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) { @@ -484,20 +404,16 @@ static int import_users (char *filename) 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)); @@ -507,24 +423,29 @@ static int import_users (char *filename) 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; } + 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; + } - pdb_set_username(sam_pwent, user_name); - pdb_set_uid (sam_pwent, uidval); + if (!pdb_init_sam_pw(&sam_pwent, pwd)) { + fprintf(stderr, "Failed initialise SAM_ACCOUNT for user %s.\n", user_name); + return False; + } /* Get passwords */ p++; @@ -537,12 +458,12 @@ static int import_users (char *filename) } 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); + pdb_free_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); + pdb_free_sam (&sam_pwent); continue; } if (!strncasecmp((char *) p, "NO PASSWORD", 11)) { @@ -551,13 +472,12 @@ static int import_users (char *filename) } 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); + pdb_free_sam (&sam_pwent); continue; } pdb_set_lanman_passwd(sam_pwent, smbpwd); } /* NT password */ - pdb_set_nt_passwd(sam_pwent, smbpwd); p += 33; if ((linebuf_len >= (PTR_DIFF(p, linebuf) + 33)) && (p[32] == ':')) { if (*p != '*' && *p != 'X') { @@ -599,49 +519,17 @@ static int import_users (char *filename) } } - /* Old-style workstation account code droped. */ - - 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); - } - - /* Test if user is valid */ - if (pdb_get_acct_ctrl(sam_pwent) & ACB_NORMAL) { - struct passwd *pwd = NULL; - - if (!(pwd = sys_getpwnam(user_name))) { - fprintf (stderr, "Error: User %s does not exist in system passwd!\n", user_name); - continue; - } - pdb_set_gid(sam_pwent, pwd->pw_gid); - } - - /* 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); + pdb_free_sam (&sam_pwent); continue; } printf ("%s imported!\n", user_name); good++; - pdb_reset_sam (sam_pwent); + pdb_free_sam (&sam_pwent); } - printf ("%d lines read.\n%d entries imported\n", line, good); - pdb_free_sam(&sam_pwent); + printf ("%d lines read.\n%d entryes imported\n", line, good); return 0; } @@ -652,7 +540,6 @@ static int import_users (char *filename) int main (int argc, char **argv) { int ch; - static pstring servicesf; BOOL list_users = False; BOOL verbose = False; BOOL spstyle = False; @@ -669,10 +556,6 @@ int main (int argc, char **argv) char *profile_path = NULL; char *smbpasswd = NULL; - pstrcpy(servicesf, dyn_CONFIGFILE); - - TimeInit(); - setup_logging("pdbedit", True); if (argc < 2) { @@ -680,21 +563,18 @@ int main (int argc, char **argv) return 0; } - if (!lp_load(servicesf,True,False,False)) { - fprintf(stderr, "Can't load %s - run testparm to debug it\n", - servicesf); - exit(1); - } - - secrets_init(); - if(!initialize_password_db(True)) { fprintf(stderr, "Can't setup password database vectors.\n"); exit(1); } + if (!lp_load(dyn_CONFIGFILE,True,False,False)) { + fprintf(stderr, "Can't load %s - run testparm to debug it\n", + dyn_CONFIGFILE); + exit(1); + } - while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwxD:")) != EOF) { + while ((ch = getopt(argc, argv, "ad:f:h:i:lmp:s:u:vwx")) != EOF) { switch(ch) { case 'a': add_user = True; @@ -741,9 +621,6 @@ int main (int argc, char **argv) import = True; smbpasswd = optarg; break; - case 'D': - DEBUGLEVEL = atoi(optarg); - break; default: usage(); } |