svn commit: samba r10528 - in branches/SAMBA_4_0/source: client gtk/common include lib lib/cmdline lib/samba3 ntvfs/cifs rpc_server/remote scripting/ejs torture torture/basic torture/rpc utils

jelmer at samba.org jelmer at samba.org
Tue Sep 27 10:00:30 GMT 2005


Author: jelmer
Date: 2005-09-27 10:00:27 +0000 (Tue, 27 Sep 2005)
New Revision: 10528

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10528

Log:
Add credentials.h back into includes.h as some compilers don't 
seem to be able to handle incomplete enum types.

Modified:
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/gtk/common/credentials.c
   branches/SAMBA_4_0/source/include/includes.h
   branches/SAMBA_4_0/source/include/structs.h
   branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
   branches/SAMBA_4_0/source/lib/credentials.c
   branches/SAMBA_4_0/source/lib/samba3/secrets.c
   branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
   branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c
   branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
   branches/SAMBA_4_0/source/torture/basic/secleak.c
   branches/SAMBA_4_0/source/torture/gentest.c
   branches/SAMBA_4_0/source/torture/locktest.c
   branches/SAMBA_4_0/source/torture/masktest.c
   branches/SAMBA_4_0/source/torture/rpc/samlogon.c
   branches/SAMBA_4_0/source/torture/rpc/samsync.c
   branches/SAMBA_4_0/source/torture/rpc/schannel.c
   branches/SAMBA_4_0/source/utils/ntlm_auth.c


Changeset:
Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================
--- branches/SAMBA_4_0/source/client/client.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/client/client.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -32,7 +32,6 @@
 #include "system/dir.h"
 #include "system/filesys.h"
 #include "dlinklist.h"
-#include "credentials.h"
 #include "system/readline.h"
 #include "pstring.h"
 

Modified: branches/SAMBA_4_0/source/gtk/common/credentials.c
===================================================================
--- branches/SAMBA_4_0/source/gtk/common/credentials.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/gtk/common/credentials.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -20,7 +20,6 @@
 
 #include "includes.h"
 #include "gtk/common/gtk-smb.h"
-#include "include/credentials.h"
 
 static void gtk_get_credentials(struct cli_credentials *credentials)
 {

Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/include/includes.h	2005-09-27 10:00:27 UTC (rev 10528)
@@ -114,6 +114,7 @@
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
 #include "lib/com/com.h"
+#include "credentials.h"
 
 #define malloc_p(type) (type *)malloc(sizeof(type))
 #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count)

Modified: branches/SAMBA_4_0/source/include/structs.h
===================================================================
--- branches/SAMBA_4_0/source/include/structs.h	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/include/structs.h	2005-09-27 10:00:27 UTC (rev 10528)
@@ -297,7 +297,3 @@
 struct param_context;
 struct param_section;
 struct param;
-
-enum credentials_obtained;
-struct cli_credentials;
-struct ccache_container;

Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===================================================================
--- branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -25,7 +25,6 @@
 #include "system/filesys.h"
 #include "system/passwd.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 /* Handle command line options:
  *		-d,--debuglevel 

Modified: branches/SAMBA_4_0/source/lib/credentials.c
===================================================================
--- branches/SAMBA_4_0/source/lib/credentials.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/lib/credentials.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -27,7 +27,6 @@
 #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */
 #include "system/kerberos.h"
 #include "auth/kerberos/kerberos.h"
-#include "include/credentials.h"
 
 
 /**

Modified: branches/SAMBA_4_0/source/lib/samba3/secrets.c
===================================================================
--- branches/SAMBA_4_0/source/lib/samba3/secrets.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/lib/samba3/secrets.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -30,7 +30,6 @@
 #include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 #include "lib/tdb/include/tdbutil.h"
-#include "credentials.h"
 
 /**
  * Unpack SID into a pointer

Modified: branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/ntvfs/cifs/vfs_cifs.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -32,7 +32,6 @@
 #include "libcli/smb_composite/smb_composite.h"
 #include "smb_server/smb_server.h"
 #include "smbd/service_stream.h"
-#include "credentials.h"
 
 /* this is stored in ntvfs_private */
 struct cvfs_private {

Modified: branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/rpc_server/remote/dcesrv_remote.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -21,7 +21,6 @@
 
 #include "includes.h"
 #include "rpc_server/dcerpc_server.h"
-#include "credentials.h"
 
 struct dcesrv_remote_private {
 	struct dcerpc_pipe *c_pipe;

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_cli.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -26,7 +26,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 #include "clilist.h"
-#include "credentials.h"
 
 #if 0
 

Modified: branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c
===================================================================
--- branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/scripting/ejs/smbcalls_creds.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -24,7 +24,6 @@
 #include "scripting/ejs/smbcalls.h"
 #include "lib/appweb/ejs/ejs.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 /*
   helper function to get the local objects credentials ptr

Modified: branches/SAMBA_4_0/source/torture/basic/secleak.c
===================================================================
--- branches/SAMBA_4_0/source/torture/basic/secleak.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/basic/secleak.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -24,7 +24,6 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "libcli/composite/composite.h"
-#include "credentials.h"
 #include "libcli/smb_composite/smb_composite.h"
 
 static BOOL try_failed_login(struct smbcli_state *cli)

Modified: branches/SAMBA_4_0/source/torture/gentest.c
===================================================================
--- branches/SAMBA_4_0/source/torture/gentest.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/gentest.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -24,7 +24,6 @@
 #include "request.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "credentials.h"
 
 #define NSERVERS 2
 #define NINSTANCES 2

Modified: branches/SAMBA_4_0/source/torture/locktest.c
===================================================================
--- branches/SAMBA_4_0/source/torture/locktest.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/locktest.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -22,7 +22,6 @@
 #include "system/filesys.h"
 #include "system/time.h"
 #include "pstring.h"
-#include "credentials.h"
 
 static int numops = 1000;
 static BOOL showall;

Modified: branches/SAMBA_4_0/source/torture/masktest.c
===================================================================
--- branches/SAMBA_4_0/source/torture/masktest.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/masktest.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -23,7 +23,6 @@
 #include "clilist.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
-#include "credentials.h"
 #include "pstring.h"
 
 static struct cli_credentials *credentials;

Modified: branches/SAMBA_4_0/source/torture/rpc/samlogon.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/rpc/samlogon.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -27,7 +27,6 @@
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"

Modified: branches/SAMBA_4_0/source/torture/rpc/samsync.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/samsync.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/rpc/samsync.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -28,7 +28,6 @@
 #include "dlinklist.h"
 #include "lib/crypto/crypto.h"
 #include "system/time.h"
-#include "credentials.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"

Modified: branches/SAMBA_4_0/source/torture/rpc/schannel.c
===================================================================
--- branches/SAMBA_4_0/source/torture/rpc/schannel.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/torture/rpc/schannel.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -24,7 +24,6 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "lib/cmdline/popt_common.h"
-#include "credentials.h"
 
 #define TEST_MACHINE_NAME "schanneltest"
 

Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===================================================================
--- branches/SAMBA_4_0/source/utils/ntlm_auth.c	2005-09-27 07:11:33 UTC (rev 10527)
+++ branches/SAMBA_4_0/source/utils/ntlm_auth.c	2005-09-27 10:00:27 UTC (rev 10528)
@@ -28,7 +28,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_security.h"
-#include "credentials.h"
 #include "pstring.h"
 
 #define SQUID_BUFFER_SIZE 2010



More information about the samba-cvs mailing list