From a2e2032d080804b4555df8938e53b395e3fe0b7b Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 14 Apr 2006 19:36:36 +0000 Subject: r15086: Get defensive about creating user accounts when winbindd fails (but is present). (This used to be commit 77fb19c45dcb07f5b675831979fbd74a99e30638) --- source3/auth/auth_util.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 31bc2664b8..4ffbba2e23 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -1469,9 +1469,12 @@ struct passwd *smb_getpwnam( TALLOC_CTX *mem_ctx, char *domuser, pw = Get_Pwnam_alloc(mem_ctx, username); - /* Create local user if requested. */ + /* Create local user if requested but only if winbindd + is not running. We need to protect against cases + where winbindd is failing and then prematurely + creating users in /etc/passwd */ - if ( !pw && create ) { + if ( !pw && create && !winbind_ping() ) { /* Don't add a machine account. */ if (username[strlen(username)-1] == '$') return NULL; -- cgit