Merge 3.5.1 from experimental

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3414 fc4039ab-9d04-0410-8cac-899223bdd6b0

4 files changed, 100 insertions, 4 deletions

diff --git a/testsuite/libsmbclient/src/Makefile b/testsuite/libsmbclient/src/Makefile
index 8b4658f7db..c8c0b673a3 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 0000000000..168ccae018
--- /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;
+
+}
diff --git a/testsuite/nsswitch/getgrent_r.c b/testsuite/nsswitch/getgrent_r.c
index 3eac8aa218..4f1f0ce8f5 100644
--- a/testsuite/nsswitch/getgrent_r.c
+++ b/testsuite/nsswitch/getgrent_r.c
@@ -21,7 +21,7 @@ void dump_grent(char *id)
 
     sprintf(fname, "/tmp/getgrent_r-%s.out-%d", id, getpid());
 
-    if ((fptr = fopen(fname, "w")) < 0) {
+    if ((fptr = fopen(fname, "w")) == NULL) {
         fprintf(stderr, "ERROR: could not open file %s: %s\n", fname,
                 sys_errlist[errno]);
         return;
diff --git a/testsuite/nsswitch/getpwent_r.c b/testsuite/nsswitch/getpwent_r.c
index 2ba7ea96f1..5e774911de 100644
--- a/testsuite/nsswitch/getpwent_r.c
+++ b/testsuite/nsswitch/getpwent_r.c
@@ -21,7 +21,7 @@ void dump_pwent(char *id)
 
     sprintf(fname, "/tmp/getpwent_r-%s.out-%d", id, getpid());
 
-    if ((fptr = fopen(fname, "w")) < 0) {
+    if ((fptr = fopen(fname, "w")) == 0) {
         fprintf(stderr, "ERROR: could not open file %s: %s\n", fname,
                 sys_errlist[errno]);
         return;