[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2510-gcb065a8

Volker Lendecke vlendec at samba.org
Mon May 19 12:55:45 GMT 2008


The branch, v3-3-test has been updated
       via  cb065a8995fa0a18f9124d0bdea70c692d6b5c58 (commit)
       via  b4b3b6b1c6a336220c6afd68b153a769397ecded (commit)
      from  30956c784f58870ad552a3869d80f99872c31375 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit cb065a8995fa0a18f9124d0bdea70c692d6b5c58
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 19 04:24:21 2008 +0200

    Don't block smbcontrol online/offline if !"winbind offline logons"
    
    There's no point to block these, winbind will ignore them anyway.
    
    Jerry, Jeremy, we definitely need a chance to trigger a reconnection attempt
    after a DC has been rebooted. Right now winbind's reaction to a single rebooted
    DC is to declare it offline. It will not try before a "winbind cache timeout"
    timeout. If the admin sets this to an hour or longer for performance reasons,
    we're screwed. Reboot your DC, no logon for an hour.
    
    Volker

commit b4b3b6b1c6a336220c6afd68b153a769397ecded
Author: Volker Lendecke <vl at samba.org>
Date:   Mon May 19 04:20:56 2008 +0200

    If no node number is given, default to the current node in smbcontrol

-----------------------------------------------------------------------

Summary of changes:
 source/lib/util.c         |    2 +-
 source/utils/smbcontrol.c |   14 --------------
 2 files changed, 1 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/util.c b/source/lib/util.c
index a6b436c..68524a2 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -3074,7 +3074,7 @@ struct server_id interpret_pid(const char *pid_string)
 		result.pid = pid;
 	}
 	else if (sscanf(pid_string, "%u", &pid) == 1) {
-		result.vnn = NONCLUSTER_VNN;
+		result.vnn = get_my_vnn();
 		result.pid = pid;
 	}
 	else {
diff --git a/source/utils/smbcontrol.c b/source/utils/smbcontrol.c
index db2eefe..6699763 100644
--- a/source/utils/smbcontrol.c
+++ b/source/utils/smbcontrol.c
@@ -865,13 +865,6 @@ static bool do_winbind_online(struct messaging_context *msg_ctx,
 		return False;
 	}
 
-	if (!lp_winbind_offline_logon()) {
-		fprintf(stderr, "The parameter \"winbind offline logon\" must "
-			"be set in the [global] section of smb.conf for this "
-			"command to be allowed.\n");
-		return False;
-	}
-
 	/* Remove the entry in the winbindd_cache tdb to tell a later
 	   starting winbindd that we're online. */
 
@@ -901,13 +894,6 @@ static bool do_winbind_offline(struct messaging_context *msg_ctx,
 		return False;
 	}
 
-	if (!lp_winbind_offline_logon()) {
-		fprintf(stderr, "The parameter \"winbind offline logon\" must "
-			"be set in the [global] section of smb.conf for this "
-			"command to be allowed.\n");
-		return False;
-	}
-
 	/* Create an entry in the winbindd_cache tdb to tell a later
 	   starting winbindd that we're offline. We may actually create
 	   it here... */


-- 
Samba Shared Repository


More information about the samba-cvs mailing list