diff options
| author | Jeremy Allison <jra@samba.org> | 2001-12-29 20:29:43 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-12-29 20:29:43 +0000 |
| commit | 11b14e838988e71880e707174493da5fd3b0b75a (patch) | |
| tree | b264185692f02963cb0d33efd30d11d6cedd0fad | |
| parent | fcb293cbab81cedb8652aff0ba4763a2a6d9235b (diff) | |
| download | samba-11b14e838988e71880e707174493da5fd3b0b75a.tar.gz samba-11b14e838988e71880e707174493da5fd3b0b75a.tar.bz2 samba-11b14e838988e71880e707174493da5fd3b0b75a.zip | |
Removed extra lp_adduser() call.
Fixed up error returns in get_correct_cversion().
Jeremy.
(This used to be commit 7ce2d1fe37d2be26c407f3dc9427851d00ca216a)
| -rw-r--r-- | source3/auth/auth_util.c | 17 | ||||
| -rw-r--r-- | source3/printing/nt_printing.c | 4 |
2 files changed, 4 insertions, 17 deletions
diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 3e480b4fd1..6f7ec8c0d7 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -85,23 +85,6 @@ void smb_user_control(const auth_usersupplied_info *user_info, auth_serversuppli if(lp_adduser_script() && !(pwd = Get_Pwnam(user_info->internal_username.str))) { smb_create_user(user_info->internal_username.str, NULL); } - } else { - if(lp_adduser_script()) { - SMB_STRUCT_STAT st; - const char *home_dir = pdb_get_homedir(server_info->sam_account); - /* - * Also call smb_create_user if the users - * home directory doesn't exist. Used with - * winbindd to allow the script to create - * the home directory for a user mapped - * with winbindd. - */ - - if (home_dir && - (sys_stat(home_dir, &st) == -1) && (errno == ENOENT)) { - smb_create_user(user_info->internal_username.str, home_dir); - } - } } } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_NO_SUCH_USER)) { /* diff --git a/source3/printing/nt_printing.c b/source3/printing/nt_printing.c index c2cd1d6eeb..b2e7a096e9 100644 --- a/source3/printing/nt_printing.c +++ b/source3/printing/nt_printing.c @@ -935,9 +935,12 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in, ZERO_STRUCT(st); + *perr = WERR_INVALID_PARAM; + /* If architecture is Windows 95/98/ME, the version is always 0. */ if (strcmp(architecture, "WIN40") == 0) { DEBUG(10,("get_correct_cversion: Driver is Win9x, cversion = 0\n")); + *perr = WERR_OK; return 0; } @@ -1018,6 +1021,7 @@ static uint32 get_correct_cversion(fstring architecture, fstring driverpath_in, close_file(fsp, True); close_cnum(conn, user->vuid); unbecome_user(); + *perr = WERR_OK; return cversion; error_exit: |