summaryrefslogtreecommitdiff
path: root/source4/param
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 22:46:41 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:50:04 +0100
commit1167c9d9c6c12d142204cfa3cad94f594f7fba76 (patch)
tree64a65eb4959315f7fc15f1b60922aa4c814a95bb /source4/param
parent70ccac0f05067c89bbf1503a614d09e3fd429110 (diff)
downloadsamba-1167c9d9c6c12d142204cfa3cad94f594f7fba76.tar.gz
samba-1167c9d9c6c12d142204cfa3cad94f594f7fba76.tar.bz2
samba-1167c9d9c6c12d142204cfa3cad94f594f7fba76.zip
r26436: Remove default of 0 for integer parameters when a lp_ctx of NULL is specified
(This used to be commit f3395db91a4dd3a89be55684f12313159d1acdd4)
Diffstat (limited to 'source4/param')
-rw-r--r--source4/param/loadparm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 982c186ae9..064f67ba82 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -611,7 +611,7 @@ static const char *lp_string(const char *s)
char fn_name(void) {return(*(char *)(ptr));}
#endif
#define FN_GLOBAL_INTEGER(fn_name,var_name) \
- int fn_name(struct loadparm_context *lp_ctx) {if (lp_ctx == NULL) return 0; return lp_ctx->globals->var_name;}
+ int fn_name(struct loadparm_context *lp_ctx) {return lp_ctx->globals->var_name;}
#define FN_LOCAL_STRING(fn_name,val) \
const char *fn_name(struct loadparm_service *service) {return(lp_string((const char *)((service != NULL && service->val != NULL) ? service->val : sDefault.val)));}