The branch, master has been updated
via 432dde0 s3:build fix the build with --fake-kaserver
via e7f66f3 s3:lib/afs fix the build
from a7fdd4f tdb: Slightly simplify transaction_write
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 432dde0223d884b7de1a9d3c0655304efbcf1f88
Author: Christian Ambach <a...@samba.org>
Date: Mon Feb 18 17:34:25 2013 +0100
s3:build fix the build with --fake-kaserver
this fixes Bug 9643 - Build in source3 of bin/net fails when configure
option
--with-fake-kaserver is used
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9643
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
Autobuild-User(master): Volker Lendecke <v...@samba.org>
Autobuild-Date(master): Tue Feb 19 19:15:19 CET 2013 on sn-devel-104
commit e7f66f37a62ad954e8b0a048905f0e6688b70849
Author: Christian Ambach <a...@samba.org>
Date: Mon Feb 18 16:55:30 2013 +0100
s3:lib/afs fix the build
Fix Bug 9644 - Compile of source3/lib/afs.c fails
Bug: https://bugzilla.samba.org/show_bug.cgi?id=9644
Signed-off-by: Christian Ambach <a...@samba.org>
Reviewed-by: Volker Lendecke <v...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 2 +-
source3/lib/afs.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 35199e9..651d286 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1241,7 +1241,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
NET_OBJ = $(NET_OBJ1) \
- $(NET_OBJ2) \
+ $(NET_OBJ2) @FAKE_KASERVER_OBJ@ \
$(LIBADDNS_OBJ0) \
$(READLINE_OBJ) \
$(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) \
diff --git a/source3/lib/afs.c b/source3/lib/afs.c
index 4b6e6ec..2d77526 100644
--- a/source3/lib/afs.c
+++ b/source3/lib/afs.c
@@ -237,7 +237,7 @@ bool afs_login(connection_struct *conn)
}
afs_username = talloc_sub_advanced(ctx,
- lp_servicename(SNUM(conn)),
+ lp_servicename(ctx, SNUM(conn)),
conn->session_info->unix_info->unix_name,
conn->connectpath,
conn->session_info->unix_token->gid,
--
Samba Shared Repository
