summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>2008-07-16 09:48:23 -0400
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>2008-07-16 09:48:23 -0400
commitdb7bff1babdb556efa54b7ff02d66fb50e833a30 (patch)
treefc436d46a35ce503234aa20d60349795f8d28408 /source3/include
parentdeac1761f0695053dec3557e06be5d53e7d189e2 (diff)
parentddc0d9deb32082a5d8d591800d638d0e96fa6ff3 (diff)
downloadsamba-db7bff1babdb556efa54b7ff02d66fb50e833a30.tar.gz
samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.tar.bz2
samba-db7bff1babdb556efa54b7ff02d66fb50e833a30.zip
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
(This used to be commit 11d74fc51c637b8129304b5de85bbe02a86a69ce)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/popt_common.h2
-rw-r--r--source3/include/proto.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index c889d2e6e6..bbd013a18f 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -28,6 +28,7 @@ extern struct poptOption popt_common_connection[];
extern struct poptOption popt_common_configfile[];
extern struct poptOption popt_common_version[];
extern struct poptOption popt_common_credentials[];
+extern struct poptOption popt_common_debuglevel[];
extern const struct poptOption popt_common_dynconfig[];
#ifndef POPT_TABLEEND
@@ -42,6 +43,7 @@ extern const struct poptOption popt_common_dynconfig[];
#define POPT_COMMON_DYNCONFIG { NULL, 0, POPT_ARG_INCLUDE_TABLE, \
CONST_DISCARD(poptOption *, popt_common_dynconfig), 0, \
"Build-time configuration overrides:", NULL },
+#define POPT_COMMON_DEBUGLEVEL { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debuglevel, 0, "Common samba debugging:", NULL },
struct user_auth_info {
char *username;
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 9958c91dca..f7f0836c8f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -6166,7 +6166,6 @@ bool lp_load_with_registry_shares(const char *pszFname,
bool save_defaults,
bool add_ipc,
bool initialize_globals);
-void lp_resetnumservices(void);
int lp_numservices(void);
void lp_dump(FILE *f, bool show_defaults, int maxtoprint);
void lp_dump_one(FILE * f, bool show_defaults, int snum);