[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-867-g238bf25

[Bo Yang]

The branch, master has been updated
       via  238bf25af44ecc51bef59f1d0b9303da9904432e (commit)
       via  b9fb8da59148f574b03e44748fca7800f940db7a (commit)
      from  4aad79041b2ababc3336db3bea90f115c5634427 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 238bf25af44ecc51bef59f1d0b9303da9904432e
Author: Bo Yang <boyang at samba.org>
Date:   Sat Aug 8 06:14:33 2009 +0800

    s3: add a test to test libsmbclient
    
    Signed-off-by: Bo Yang <boyang at samba.org>

commit b9fb8da59148f574b03e44748fca7800f940db7a
Author: Bo Yang <boyang at samba.org>
Date:   Sat Aug 8 06:10:37 2009 +0800

    s3: Fix nss info substitution
    
    Signed-off-by: Bo Yang <boyang at samba.org>

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

Summary of changes:
 source3/winbindd/wb_getpwsid.c           |    6 +-
 testsuite/libsmbclient/src/Makefile      |    9 ++-
 testsuite/libsmbclient/src/stat/stat_k.c |   91 ++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+), 5 deletions(-)
 create mode 100644 testsuite/libsmbclient/src/stat/stat_k.c


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index a823ba3..fc696cb 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -191,7 +191,7 @@ static void wb_getpwsid_sid2gid_done(struct tevent_req *subreq)
 	fstrcpy(state->pw->pw_passwd, "*");
 	fstrcpy(state->pw->pw_gecos, state->userinfo->full_name);
 
-	if (!fillup_pw_field(lp_template_homedir(), state->pw->pw_name,
+	if (!fillup_pw_field(lp_template_homedir(), username,
 			     state->user_domain->name, state->pw->pw_uid,
 			     state->pw->pw_gid, state->userinfo->homedir,
 			     state->pw->pw_dir)) {
@@ -200,9 +200,9 @@ static void wb_getpwsid_sid2gid_done(struct tevent_req *subreq)
 		return;
 	}
 
-	if (!fillup_pw_field(lp_template_homedir(), state->pw->pw_name,
+	if (!fillup_pw_field(lp_template_shell(), state->pw->pw_name,
 			     state->user_domain->name, state->pw->pw_uid,
-			     state->pw->pw_gid, state->userinfo->homedir,
+			     state->pw->pw_gid, state->userinfo->shell,
 			     state->pw->pw_shell)) {
 		DEBUG(5, ("Could not compose shell\n"));
 		tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
diff --git a/testsuite/libsmbclient/src/Makefile b/testsuite/libsmbclient/src/Makefile
index 8b4658f..c8c0b67 100644
--- a/testsuite/libsmbclient/src/Makefile
+++ b/testsuite/libsmbclient/src/Makefile
@@ -2,7 +2,7 @@ CC	=	gcc
 CFLAGS	=	-Wall -W -O2 -g -I../../../source/include
 LFLAGS	=	-L../../../source/bin
 
-LIBS=	-L/usr/lib -lsmbclient
+LIBS=	-L/usr/lib -lsmbclient -ltalloc
 INCPATH= -I. -I/usr/include -I./include
 BIN_DIR=bin
 
@@ -99,7 +99,8 @@ G_STAT		= 	$(BIN_DIR)/stat_1 \
 			$(BIN_DIR)/stat_3 \
 			$(BIN_DIR)/stat_4 \
 			$(BIN_DIR)/stat_5 \
-			$(BIN_DIR)/stat_6
+			$(BIN_DIR)/stat_6 \
+			$(BIN_DIR)/stat_k
 
 G_GETDENTS	= 	$(BIN_DIR)/getdents_1 \
 			$(BIN_DIR)/getdents_2 \
@@ -521,6 +522,10 @@ $(BIN_DIR)/stat_6:	stat/stat_6.o
 	@echo Linking $@
 	@$(CC) $(LFLAGS) -o $@ stat/stat_6.o $(INCPATH) $(LIBS)
 
+$(BIN_DIR)/stat_k:	stat/stat_k.o
+	@echo Linking $@
+	@$(CC) $(LFLAGS) -o $@ stat/stat_k.o $(INCPATH) $(LIBS)
+
 $(BIN_DIR)/getdents_1:	getdents/getdents_1.o
 	@echo Linking $@
 	@$(CC) $(LFLAGS) -o $@ getdents/getdents_1.o $(INCPATH) $(LIBS)
diff --git a/testsuite/libsmbclient/src/stat/stat_k.c b/testsuite/libsmbclient/src/stat/stat_k.c
new file mode 100644
index 0000000..168ccae
--- /dev/null
+++ b/testsuite/libsmbclient/src/stat/stat_k.c
@@ -0,0 +1,91 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <libsmbclient.h>
+
+#define	MAX_BUFF_SIZE	255
+char g_workgroup[MAX_BUFF_SIZE];
+char g_username[MAX_BUFF_SIZE];
+char g_password[MAX_BUFF_SIZE];
+char g_server[MAX_BUFF_SIZE];
+char g_share[MAX_BUFF_SIZE];
+
+
+void auth_fn(const char *server, const char *share, char *workgroup, int wgmaxlen,
+		char *username, int unmaxlen, char *password, int pwmaxlen)
+{
+
+	strncpy(workgroup, g_workgroup, wgmaxlen - 1);
+
+	strncpy(username, g_username, unmaxlen - 1);
+
+	strncpy(password, g_password, pwmaxlen - 1);
+
+	strcpy(g_server, server);
+	strcpy(g_share, share);
+
+}
+
+int main(int argc, char** argv)
+{
+	int err = -1;
+	char url[MAX_BUFF_SIZE];
+	struct stat st;
+	char *user;
+	SMBCCTX *ctx;
+
+	bzero(g_workgroup,MAX_BUFF_SIZE);
+	bzero(url,MAX_BUFF_SIZE);
+
+	if ( argc == 2)
+	{
+		char *p;
+		user = getenv("USER");
+		if (!user) {
+			printf("no user??\n");
+			return 0;
+		}
+
+		printf("username: %s\n", user);
+
+		p = strchr(user, '\\');
+		if (! p) {
+			printf("BAD username??\n");
+			return 0;
+		}
+		strncpy(g_workgroup, user, strlen(user));
+		g_workgroup[p - user] = 0;
+		strncpy(g_username, p + 1, strlen(p + 1));
+		memset(g_password, 0, sizeof(char) * MAX_BUFF_SIZE);
+		strncpy(url,argv[1],strlen(argv[1]));
+
+		err = smbc_init(auth_fn, 10);
+		if (err) {
+			printf("init smbclient context failed!!\n");
+			return err;
+		}
+		/* Using null context actually get the old context. */
+		ctx = smbc_set_context(NULL);
+		smbc_setOptionUseKerberos(ctx, 1);
+		smbc_setOptionFallbackAfterKerberos(ctx, 1);
+		smbc_setWorkgroup(ctx, g_workgroup);
+		smbc_setUser(ctx, g_username);
+		err = smbc_stat(url, &st);
+
+		if ( err < 0 ) {
+			err = 1;
+			printf("stat failed!!\n");
+		}
+		else {
+			err = 0;
+			printf("stat succeeded!!\n");
+		}
+
+
+	}
+
+	return err;
+
+}


-- 
Samba Shared Repository