svn commit: samba r6587 - in trunk/source: lib libads libsmb smbd
tests torture
herb at samba.org
herb at samba.org
Mon May 2 17:53:09 GMT 2005
Author: herb
Date: 2005-05-02 17:53:09 +0000 (Mon, 02 May 2005)
New Revision: 6587
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6587
Log:
merge change 6586 from SAMBA_3_0
Modified:
trunk/source/lib/dummyroot.c
trunk/source/lib/dummysmbd.c
trunk/source/lib/interfaces.c
trunk/source/lib/sysquotas.c
trunk/source/lib/sysquotas_4A.c
trunk/source/lib/sysquotas_linux.c
trunk/source/lib/sysquotas_xfs.c
trunk/source/libads/kerberos.c
trunk/source/libsmb/clikrb5.c
trunk/source/smbd/notify_kernel.c
trunk/source/smbd/oplock_linux.c
trunk/source/tests/shlib.c
trunk/source/tests/sysquotas.c
trunk/source/torture/denytest.c
trunk/source/torture/mangle_test.c
trunk/source/torture/torture.c
Changeset:
Modified: trunk/source/lib/dummyroot.c
===================================================================
--- trunk/source/lib/dummyroot.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummyroot.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,9 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void become_root(void);
+void unbecome_root(void);
+
void become_root(void)
{
return;
Modified: trunk/source/lib/dummysmbd.c
===================================================================
--- trunk/source/lib/dummysmbd.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/dummysmbd.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,8 @@
/* Stupid dummy functions required due to the horrible dependency mess
in Samba. */
+void decrement_smbd_process_count( void );
+
void decrement_smbd_process_count( void )
{
return;
Modified: trunk/source/lib/interfaces.c
===================================================================
--- trunk/source/lib/interfaces.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/interfaces.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -358,6 +358,8 @@
/* this wrapper is used to remove duplicates from the interface list generated
above */
+int get_interfaces(struct iface_struct *ifaces, int max_interfaces);
+
int get_interfaces(struct iface_struct *ifaces, int max_interfaces)
{
int total, i, j;
Modified: trunk/source/lib/sysquotas.c
===================================================================
--- trunk/source/lib/sysquotas.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -497,6 +497,8 @@
}
#else /* HAVE_SYS_QUOTAS */
+ void dummy_sysquotas_c(void);
+
void dummy_sysquotas_c(void)
{
return;
Modified: trunk/source/lib/sysquotas_4A.c
===================================================================
--- trunk/source/lib/sysquotas_4A.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_4A.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -335,5 +335,7 @@
}
#else /* HAVE_QUOTACTL_4A */
+ void dummy_sysquotas_4A(void);
+
void dummy_sysquotas_4A(void){}
#endif /* HAVE_QUOTACTL_4A */
Modified: trunk/source/lib/sysquotas_linux.c
===================================================================
--- trunk/source/lib/sysquotas_linux.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_linux.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -556,5 +556,7 @@
}
#else /* HAVE_QUOTACTL_LINUX */
+ void dummy_sysquotas_linux(void);
+
void dummy_sysquotas_linux(void){}
#endif /* HAVE_QUOTACTL_LINUX */
Modified: trunk/source/lib/sysquotas_xfs.c
===================================================================
--- trunk/source/lib/sysquotas_xfs.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/lib/sysquotas_xfs.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -329,5 +329,7 @@
}
#else /* HAVE_XFS_QUOTAS */
+ void dummy_sysquotas_xfs(void);
+
void dummy_sysquotas_xfs(void){}
#endif /* HAVE_XFS_QUOTAS */
Modified: trunk/source/libads/kerberos.c
===================================================================
--- trunk/source/libads/kerberos.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libads/kerberos.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -247,7 +247,7 @@
Setting principal to NULL deletes this entry.
************************************************************************/
- BOOL kerberos_secrets_store_salting_principal(const char *service,
+BOOL kerberos_secrets_store_salting_principal(const char *service,
int enctype,
const char *principal)
{
Modified: trunk/source/libsmb/clikrb5.c
===================================================================
--- trunk/source/libsmb/clikrb5.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/libsmb/clikrb5.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -525,11 +525,13 @@
#if defined(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING) && !defined(HAVE_KRB5_PRINC_COMPONENT)
+ const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i );
+
const krb5_data *krb5_princ_component(krb5_context context, krb5_principal principal, int i )
{
static krb5_data kdata;
- kdata.data = krb5_principal_get_comp_string(context, principal, i);
+ kdata.data = (char *)krb5_principal_get_comp_string(context, principal, i);
kdata.length = strlen(kdata.data);
return &kdata;
}
Modified: trunk/source/smbd/notify_kernel.c
===================================================================
--- trunk/source/smbd/notify_kernel.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/smbd/notify_kernel.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -241,5 +241,7 @@
}
#else
+ void notify_kernel_dummy(void);
+
void notify_kernel_dummy(void) {}
#endif /* HAVE_KERNEL_CHANGE_NOTIFY */
Modified: trunk/source/smbd/oplock_linux.c
===================================================================
--- trunk/source/smbd/oplock_linux.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/smbd/oplock_linux.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -310,5 +310,7 @@
return &koplocks;
}
#else
+ void oplock_linux_dummy(void);
+
void oplock_linux_dummy(void) {}
#endif /* HAVE_KERNEL_OPLOCKS_LINUX */
Modified: trunk/source/tests/shlib.c
===================================================================
--- trunk/source/tests/shlib.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/tests/shlib.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -1,5 +1,7 @@
/* a trivial function used to test building shared libraries */
+int foo(void);
+
int foo(void)
{
return 1;
Modified: trunk/source/tests/sysquotas.c
===================================================================
--- trunk/source/tests/sysquotas.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/tests/sysquotas.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -28,6 +28,8 @@
#define SYS_DQBLK dqblk
#endif
+ int autoconf_quota(void);
+
int autoconf_quota(void)
{
int ret = -1;
Modified: trunk/source/torture/denytest.c
===================================================================
--- trunk/source/torture/denytest.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/torture/denytest.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -1556,8 +1556,8 @@
resultstr(denytable2[i].result));
}
- cli_close(cli1, fnum1);
- cli_close(cli2, fnum2);
+ if (fnum1 != -1) cli_close(cli1, fnum1);
+ if (fnum2 != -1) cli_close(cli2, fnum2);
}
for (i=0;i<2;i++) {
Modified: trunk/source/torture/mangle_test.c
===================================================================
--- trunk/source/torture/mangle_test.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/torture/mangle_test.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -20,6 +20,8 @@
#include "includes.h"
+extern int torture_numops;
+
static TDB_CONTEXT *tdb;
#define NAME_LENGTH 20
@@ -159,7 +161,6 @@
BOOL torture_mangle(int dummy)
{
- extern int torture_numops;
static struct cli_state *cli;
int i;
BOOL ret = True;
Modified: trunk/source/torture/torture.c
===================================================================
--- trunk/source/torture/torture.c 2005-05-02 17:49:43 UTC (rev 6586)
+++ trunk/source/torture/torture.c 2005-05-02 17:53:09 UTC (rev 6587)
@@ -22,6 +22,9 @@
#include "includes.h"
+extern char *optarg;
+extern int optind;
+
static fstring host, workgroup, share, password, username, myname;
static int max_protocol = PROTOCOL_NT1;
static const char *sockops="TCP_NODELAY";
@@ -4902,8 +4905,6 @@
char *p;
int gotuser = 0;
int gotpass = 0;
- extern char *optarg;
- extern int optind;
BOOL correct = True;
dbf = x_stdout;
More information about the samba-cvs
mailing list