[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Thu Aug 5 04:08:55 MDT 2010
The branch, master has been updated
via 174a468... s3-spoolss: Use the correct value for the data length.
via ce2a086... s3-popt: Only include popt-common.h when needed.
from c136b84... s3-secrets: only include secrets.h when needed.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 174a46837d728e67e8a8226db143f9018f5faf2d
Author: Andreas Schneider <asn at samba.org>
Date: Thu Aug 5 11:36:37 2010 +0200
s3-spoolss: Use the correct value for the data length.
commit ce2a086119330a0a39e6d7423432c1b2e0da247b
Author: Andreas Schneider <asn at samba.org>
Date: Thu Aug 5 10:49:53 2010 +0200
s3-popt: Only include popt-common.h when needed.
-----------------------------------------------------------------------
Summary of changes:
nsswitch/wbinfo.c | 1 +
source3/client/client.c | 1 +
source3/include/includes.h | 1 -
source3/include/popt_common.h | 2 ++
source3/include/proto.h | 4 ----
source3/include/smb.h | 2 --
source3/lib/netapi/cm.c | 1 +
source3/lib/popt_common.c | 1 +
source3/lib/smbconf/testsuite.c | 1 +
source3/lib/util.c | 1 +
source3/libsmb/cliconnect.c | 1 +
source3/libsmb/libsmb_dir.c | 1 +
source3/nmbd/nmbd.c | 1 +
source3/rpc_server/srv_spoolss_util.c | 4 ++--
source3/rpcclient/rpcclient.c | 1 +
source3/smbd/server.c | 1 +
source3/torture/pdbtest.c | 1 +
source3/torture/smbiconv.c | 1 +
source3/torture/vfstest.c | 1 +
source3/utils/dbwrap_torture.c | 1 +
source3/utils/log2pcaphex.c | 1 +
source3/utils/net.c | 1 +
source3/utils/net_rpc_registry.c | 1 +
source3/utils/net_rpc_sh_acct.c | 1 +
source3/utils/net_rpc_shell.c | 1 +
source3/utils/nmblookup.c | 1 +
source3/utils/ntlm_auth.c | 1 +
source3/utils/pdbedit.c | 1 +
source3/utils/profiles.c | 1 +
source3/utils/sharesec.c | 1 +
source3/utils/smbcacls.c | 1 +
source3/utils/smbcontrol.c | 1 +
source3/utils/smbcquotas.c | 1 +
source3/utils/smbget.c | 1 +
source3/utils/smbtree.c | 1 +
source3/utils/status.c | 1 +
source3/utils/testparm.c | 1 +
source3/web/swat.c | 1 +
source3/winbindd/winbindd.c | 1 +
39 files changed, 38 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index 0369d40..b986a43 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "winbind_client.h"
#include "libwbclient/wbclient.h"
#include "lib/popt/popt.h"
diff --git a/source3/client/client.c b/source3/client/client.c
index d439581..8716f74 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "client/client_proto.h"
#include "../librpc/gen_ndr/cli_srvsvc.h"
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 318c747..fcc6fe0 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -659,7 +659,6 @@ struct ntlmssp_state;
#include "client.h"
#include "session.h"
-#include "popt.h"
#include "mangle.h"
#include "module.h"
#include "nsswitch/winbind_client.h"
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index a6e43d2..040fae9 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -58,4 +58,6 @@ struct user_auth_info {
bool use_ccache;
};
+void popt_common_set_auth_info(struct user_auth_info *auth_info);
+
#endif /* _POPT_COMMON_H */
diff --git a/source3/include/proto.h b/source3/include/proto.h
index fe97726..2e081aa 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -655,10 +655,6 @@ pid_t pidfile_pid(const char *name);
void pidfile_create(const char *program_name);
void pidfile_unlink(void);
-/* The following definitions come from lib/popt_common.c */
-
-void popt_common_set_auth_info(struct user_auth_info *auth_info);
-
/* The following definitions come from lib/privileges.c */
bool get_privileges_for_sids(SE_PRIV *privileges, struct dom_sid *slist, int scount);
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 53228ba..ca71245 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1859,8 +1859,6 @@ struct unix_error_map {
#define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14
-#include "popt_common.h"
-
#define PORT_NONE 0
#ifndef LDAP_PORT
#define LDAP_PORT 389
diff --git a/source3/lib/netapi/cm.c b/source3/lib/netapi/cm.c
index 3a624bf..630c74e 100644
--- a/source3/lib/netapi/cm.c
+++ b/source3/lib/netapi/cm.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "lib/netapi/netapi.h"
#include "lib/netapi/netapi_private.h"
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 060382b..9dd438b 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
/* Handle command line options:
* -d,--debuglevel
diff --git a/source3/lib/smbconf/testsuite.c b/source3/lib/smbconf/testsuite.c
index 42ef76d..2c6fedc 100644
--- a/source3/lib/smbconf/testsuite.c
+++ b/source3/lib/smbconf/testsuite.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "lib/smbconf/smbconf.h"
#include "lib/smbconf/smbconf_init.h"
#include "lib/smbconf/smbconf_reg.h"
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 6770a71..8bea36b 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "secrets.h"
extern char *global_clobber_region_function;
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index a0f8f28..9d84585 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "../libcli/auth/libcli_auth.h"
#include "../libcli/auth/spnego.h"
#include "smb_krb5.h"
diff --git a/source3/libsmb/libsmb_dir.c b/source3/libsmb/libsmb_dir.c
index 6d3da1c..7661ecf 100644
--- a/source3/libsmb/libsmb_dir.c
+++ b/source3/libsmb/libsmb_dir.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "libsmbclient.h"
#include "libsmb_internal.h"
#include "../librpc/gen_ndr/cli_srvsvc.h"
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index dd42675..16a4d7d 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "librpc/gen_ndr/messaging.h"
int ClientNMB = -1;
diff --git a/source3/rpc_server/srv_spoolss_util.c b/source3/rpc_server/srv_spoolss_util.c
index ab6be2f..076e2da 100644
--- a/source3/rpc_server/srv_spoolss_util.c
+++ b/source3/rpc_server/srv_spoolss_util.c
@@ -499,7 +499,7 @@ static WERROR winreg_printer_enumvalues(TALLOC_CTX *mem_ctx,
val.value_name_len = strlen_m_term(val.value_name) * 2;
val.type = type;
- val.data_length = data_size;
+ val.data_length = length;
val.data = NULL;
if (val.data_length) {
val.data = talloc(enum_values, DATA_BLOB);
@@ -507,7 +507,7 @@ static WERROR winreg_printer_enumvalues(TALLOC_CTX *mem_ctx,
result = WERR_NOMEM;
goto error;
}
- *val.data = data_blob_talloc(enum_values, data, data_size);
+ *val.data = data_blob_talloc(val.data, data, val.data_length);
}
enum_values[i] = val;
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 565aaa8..4ea2b74 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "rpcclient.h"
#include "../libcli/auth/libcli_auth.h"
#include "../librpc/gen_ndr/cli_lsa.h"
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index dba5204..82f2f48 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "smbd/globals.h"
#include "librpc/gen_ndr/messaging.h"
#include "registry.h"
diff --git a/source3/torture/pdbtest.c b/source3/torture/pdbtest.c
index 950177c..a775791 100644
--- a/source3/torture/pdbtest.c
+++ b/source3/torture/pdbtest.c
@@ -21,6 +21,7 @@
#include "includes.h"
+#include "popt_common.h"
static bool samu_correct(struct samu *s1, struct samu *s2)
{
diff --git a/source3/torture/smbiconv.c b/source3/torture/smbiconv.c
index 47353d2..d5d580c 100644
--- a/source3/torture/smbiconv.c
+++ b/source3/torture/smbiconv.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#undef realloc
static int
diff --git a/source3/torture/vfstest.c b/source3/torture/vfstest.c
index ea18bb3..75feff8 100644
--- a/source3/torture/vfstest.c
+++ b/source3/torture/vfstest.c
@@ -24,6 +24,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "vfstest.h"
/* List to hold groups of commands */
diff --git a/source3/utils/dbwrap_torture.c b/source3/utils/dbwrap_torture.c
index 04e1794..1430161 100644
--- a/source3/utils/dbwrap_torture.c
+++ b/source3/utils/dbwrap_torture.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#if 0
#include "lib/events/events.h"
diff --git a/source3/utils/log2pcaphex.c b/source3/utils/log2pcaphex.c
index 5b94691..0b1230e 100644
--- a/source3/utils/log2pcaphex.c
+++ b/source3/utils/log2pcaphex.c
@@ -51,6 +51,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
/* We don't care about the paranoid malloc checker in this standalone
program */
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 1c34285..d9a1bf6 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -41,6 +41,7 @@
/*****************************************************/
#include "includes.h"
+#include "popt_common.h"
#include "utils/net.h"
#include "secrets.h"
diff --git a/source3/utils/net_rpc_registry.c b/source3/utils/net_rpc_registry.c
index 0814235..cfc2a7e 100644
--- a/source3/utils/net_rpc_registry.c
+++ b/source3/utils/net_rpc_registry.c
@@ -18,6 +18,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "includes.h"
+#include "popt_common.h"
#include "registry.h"
#include "utils/net.h"
#include "utils/net_registry_util.h"
diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index 3e93fc5..435af09 100644
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -17,6 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
+#include "popt_common.h"
#include "utils/net.h"
#include "../librpc/gen_ndr/cli_samr.h"
diff --git a/source3/utils/net_rpc_shell.c b/source3/utils/net_rpc_shell.c
index b1de4d2..b04e6bd 100644
--- a/source3/utils/net_rpc_shell.c
+++ b/source3/utils/net_rpc_shell.c
@@ -19,6 +19,7 @@
#include "includes.h"
+#include "popt_common.h"
#include "utils/net.h"
#include "../librpc/gen_ndr/ndr_samr.h"
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 63c9a34..1187c96 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
extern bool AllowDebugChange;
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index 1ddc94b..d234a3c 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -24,6 +24,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "utils/ntlm_auth.h"
#include "../libcli/auth/libcli_auth.h"
#include "../libcli/auth/spnego.h"
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index c6ccbc8..b3c6d14 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#define BIT_BACKEND 0x00000004
#define BIT_VERBOSE 0x00000008
diff --git a/source3/utils/profiles.c b/source3/utils/profiles.c
index ce330a8..f6f500a 100644
--- a/source3/utils/profiles.c
+++ b/source3/utils/profiles.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "registry/reg_objects.h"
#include "regfio.h"
diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index a29995b..79078b2 100644
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -23,6 +23,7 @@
#include "includes.h"
+#include "popt_common.h"
static TALLOC_CTX *ctx;
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 46361ad..65fec10 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
#include "rpc_client/cli_lsarpc.h"
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 58e03fb..09f4f31 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -24,6 +24,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "librpc/gen_ndr/messaging.h"
#include "librpc/gen_ndr/spoolss.h"
#include "nt_printing.h"
diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 3f98b12..f575872 100644
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "../librpc/gen_ndr/ndr_lsa.h"
#include "rpc_client/cli_lsarpc.h"
diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 8b88a0f..62ecb34 100644
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -17,6 +17,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "includes.h"
+#include "popt_common.h"
#include "libsmbclient.h"
#if _FILE_OFFSET_BITS==64
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index d7ba123..f27011c 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "../librpc/gen_ndr/cli_srvsvc.h"
static int use_bcast;
diff --git a/source3/utils/status.c b/source3/utils/status.c
index d2b10c1..fb23789 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -31,6 +31,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#define SMB_MAXPIDS 2048
static uid_t Ucrit_uid = 0; /* added by OH */
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 8ce0d58..6d606bb 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -32,6 +32,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
extern bool AllowDebugChange;
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 5e4b950..720018d 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -28,6 +28,7 @@
**/
#include "includes.h"
+#include "popt_common.h"
#include "web/swat_proto.h"
static int demo_mode = False;
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 05114b2..8dbcb12 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "popt_common.h"
#include "winbindd.h"
#include "../../nsswitch/libwbclient/wbc_async.h"
#include "librpc/gen_ndr/messaging.h"
--
Samba Shared Repository
More information about the samba-cvs
mailing list