[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-154-gddb62bf

[Andrew Bartlett]

The branch, v4-0-test has been updated
       via  ddb62bf6cc9371c11778ea6630ef0fbbe22cd4f9 (commit)
       via  d10c9b71ea7f2670c4ea5ec569bcb7f49ec41362 (commit)
      from  963bcfc777679ba122189ea6cf7f94b8d46cdce7 (commit)

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


- Log -----------------------------------------------------------------
commit ddb62bf6cc9371c11778ea6630ef0fbbe22cd4f9
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 13:42:50 2008 +1000

    Update Fedora packaging per feedback on review ticket.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=453083

commit d10c9b71ea7f2670c4ea5ec569bcb7f49ec41362
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Mon Jun 30 12:22:50 2008 +1000

    Rework samdb handling for 'netlogon' packets.
    
    Don't reopen the samdb for every netlogon packet, and use the
    system_session(), as we must access data not available to anonymous.
    Perhaps we should consider a 'authenticated but not system' token, if
    we want more control on this.
    
    Andrew Bartlett

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

Summary of changes:
 packaging/Fedora/samba4.spec       |    7 ++++---
 source/cldap_server/cldap_server.c |    2 +-
 source/nbt_server/dgram/netlogon.c |   12 ++----------
 source/nbt_server/nbt_server.c     |    2 +-
 4 files changed, 8 insertions(+), 15 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/Fedora/samba4.spec b/packaging/Fedora/samba4.spec
index ad929f1..58af948 100644
--- a/packaging/Fedora/samba4.spec
+++ b/packaging/Fedora/samba4.spec
@@ -13,7 +13,7 @@ Summary: The Samba4 CIFS and AD client and server suite
 Name: samba4
 Epoch: 0
 Version: 4.0.0
-Release: 0.alpha%{alpha_version}.%{main_release}%{?dist}
+Release: 0.%{main_release}.alpha%{alpha_version}%{?dist}
 License: GPLv3+, LGPLv3+, BSD
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -228,7 +228,8 @@ find -type f | xargs chmod -x
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
+getent group wbpriv >/dev/null || groupadd -g 88 wbpriv
+exit 0
 
 %post
 /sbin/chkconfig --add %{name}
@@ -347,5 +348,5 @@ exit 0
 %doc WHATSNEW.txt
 
 %changelog
-* Thu Jun 26 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.alpha4.1.fc9
+* Thu Jun 26 2008 Andrew Bartlett <abartlet at samba.org> - 0:4.0.0-0.1.alpha4.fc9
 - Rework Fedora's Samba 3.2.0-1.rc2.16 spec file for Samba4
diff --git a/source/cldap_server/cldap_server.c b/source/cldap_server/cldap_server.c
index 58e9e2d..310fb56 100644
--- a/source/cldap_server/cldap_server.c
+++ b/source/cldap_server/cldap_server.c
@@ -187,7 +187,7 @@ static void cldapd_task_init(struct task_server *task)
 	}
 
 	cldapd->task = task;
-	cldapd->samctx = samdb_connect(cldapd, task->event_ctx, task->lp_ctx, anonymous_session(cldapd, task->event_ctx, task->lp_ctx));
+	cldapd->samctx = samdb_connect(cldapd, task->event_ctx, task->lp_ctx, system_session(cldapd, task->lp_ctx));
 	if (cldapd->samctx == NULL) {
 		task_server_terminate(task, "cldapd failed to open samdb");
 		return;
diff --git a/source/nbt_server/dgram/netlogon.c b/source/nbt_server/dgram/netlogon.c
index 5e263a5..5e95270 100644
--- a/source/nbt_server/dgram/netlogon.c
+++ b/source/nbt_server/dgram/netlogon.c
@@ -56,11 +56,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot,
 		return;
 	}
 
-	samctx = samdb_connect(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx, anonymous_session(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx));
-	if (samctx == NULL) {
-		DEBUG(2,("Unable to open sam in getdc reply\n"));
-		return;
-	}
+	samctx = iface->nbtsrv->sam_ctx;
 
 	if (!samdb_is_pdc(samctx)) {
 		DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n"));
@@ -126,11 +122,7 @@ static void nbtd_netlogon_samlogon(struct dgram_mailslot_handler *dgmslot,
 		return;
 	}
 
-	samctx = samdb_connect(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx, anonymous_session(packet, iface->nbtsrv->task->event_ctx, iface->nbtsrv->task->lp_ctx));
-	if (samctx == NULL) {
-		DEBUG(2,("Unable to open sam in getdc reply\n"));
-		return;
-	}
+	samctx = iface->nbtsrv->sam_ctx;
 
 	if (netlogon->req.logon.sid_size) {
 		sid = &netlogon->req.logon.sid;
diff --git a/source/nbt_server/nbt_server.c b/source/nbt_server/nbt_server.c
index 832bbe0..e6ff500 100644
--- a/source/nbt_server/nbt_server.c
+++ b/source/nbt_server/nbt_server.c
@@ -66,7 +66,7 @@ static void nbtd_task_init(struct task_server *task)
 		return;
 	}
 
-	nbtsrv->sam_ctx = samdb_connect(nbtsrv, task->event_ctx, task->lp_ctx, anonymous_session(nbtsrv, task->event_ctx, task->lp_ctx));
+	nbtsrv->sam_ctx = samdb_connect(nbtsrv, task->event_ctx, task->lp_ctx, system_session(nbtsrv, task->lp_ctx));
 	if (nbtsrv->sam_ctx == NULL) {
 		task_server_terminate(task, "nbtd failed to open samdb");
 		return;


-- 
Samba Shared Repository