The branch, master has been updated
via 2efacde8c4346130227728f11a98481ed1e01515 (commit)
from 4f25c779243ba38fce26dea51feafcf28492d79b (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 2efacde8c4346130227728f11a98481ed1e01515
Author: Tim Prouty <[EMAIL PROTECTED]>
Date: Mon Nov 3 12:36:34 2008 -0800
s3: fix a few "shadows a global declaration" warnings
-----------------------------------------------------------------------
Summary of changes:
source3/lib/popt_common.c | 8 ++++----
source3/nmbd/nmbd.c | 8 ++++----
source3/winbindd/winbindd.c | 18 +++++++++---------
source3/winbindd/winbindd_cm.c | 8 ++++----
source3/winbindd/winbindd_proto.h | 2 +-
5 files changed, 22 insertions(+), 22 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c
index 8ceac26..2e6d3b3 100644
--- a/source3/lib/popt_common.c
+++ b/source3/lib/popt_common.c
@@ -39,7 +39,7 @@ extern bool override_logfile;
static void set_logfile(poptContext con, const char * arg)
{
- char *logfile = NULL;
+ char *lfile = NULL;
const char *pname;
/* Find out basename of current program */
@@ -50,11 +50,11 @@ static void set_logfile(poptContext con, const char * arg)
else
pname++;
- if (asprintf(&logfile, "%s/log.%s", arg, pname) < 0) {
+ if (asprintf(&lfile, "%s/log.%s", arg, pname) < 0) {
return;
}
- lp_set_logfile(logfile);
- SAFE_FREE(logfile);
+ lp_set_logfile(lfile);
+ SAFE_FREE(lfile);
}
static bool PrintSambaVersionString;
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index adc331c..d1ab3aa 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -803,12 +803,12 @@ static bool open_sockets(bool isdaemon, int port)
sys_srandom(time(NULL) ^ sys_getpid());
if (!override_logfile) {
- char *logfile = NULL;
- if (asprintf(&logfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) <
0) {
+ char *lfile = NULL;
+ if (asprintf(&lfile, "%s/log.nmbd", get_dyn_LOGFILEBASE()) < 0)
{
exit(1);
}
- lp_set_logfile(logfile);
- SAFE_FREE(logfile);
+ lp_set_logfile(lfile);
+ SAFE_FREE(lfile);
}
fault_setup((void (*)(void *))fault_continue );
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index ac2a87f..ce1a1fe 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -59,7 +59,7 @@ struct messaging_context *winbind_messaging_context(void)
/* Reload configuration */
-static bool reload_services_file(const char *logfile)
+static bool reload_services_file(const char *lfile)
{
bool ret;
@@ -73,8 +73,8 @@ static bool reload_services_file(const char *logfile)
/* if this is a child, restore the logfile to the special
name - <domain>, idmap, etc. */
- if (logfile && *logfile) {
- lp_set_logfile(logfile);
+ if (lfile && *lfile) {
+ lp_set_logfile(lfile);
}
reopen_logs();
@@ -792,14 +792,14 @@ static bool remove_idle_client(void)
}
/* check if HUP has been received and reload files */
-void winbind_check_sighup(const char *logfile)
+void winbind_check_sighup(const char *lfile)
{
if (do_sighup) {
DEBUG(3, ("got SIGHUP\n"));
flush_caches();
- reload_services_file(logfile);
+ reload_services_file(lfile);
do_sighup = False;
}
@@ -1096,11 +1096,11 @@ int main(int argc, char **argv, char **envp)
poptFreeContext(pc);
if (!override_logfile) {
- char *logfile = NULL;
- if (asprintf(&logfile,"%s/log.winbindd",
+ char *lfile = NULL;
+ if (asprintf(&lfile,"%s/log.winbindd",
get_dyn_LOGFILEBASE()) > 0) {
- lp_set_logfile(logfile);
- SAFE_FREE(logfile);
+ lp_set_logfile(lfile);
+ SAFE_FREE(lfile);
}
}
setup_logging("winbindd", log_stdout);
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index b4490a0..3c69859 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -225,10 +225,10 @@ static bool fork_child_dc_connect(struct winbindd_domain
*domain)
close_conns_after_fork();
if (!override_logfile) {
- char *logfile;
- if (asprintf(&logfile, "%s/log.winbindd-dc-connect",
get_dyn_LOGFILEBASE()) > 0) {
- lp_set_logfile(logfile);
- SAFE_FREE(logfile);
+ char *lfile;
+ if (asprintf(&lfile, "%s/log.winbindd-dc-connect",
get_dyn_LOGFILEBASE()) > 0) {
+ lp_set_logfile(lfile);
+ SAFE_FREE(lfile);
reopen_logs();
}
}
diff --git a/source3/winbindd/winbindd_proto.h
b/source3/winbindd/winbindd_proto.h
index 95ccf30..65ad47d 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -63,7 +63,7 @@ void setup_async_write(struct fd_event *event, void *data,
size_t length,
void *private_data);
void request_error(struct winbindd_cli_state *state);
void request_ok(struct winbindd_cli_state *state);
-void winbind_check_sighup(const char *logfile);
+void winbind_check_sighup(const char *lfile);
void winbind_check_sigterm(bool in_parent);
int main(int argc, char **argv, char **envp);
--
Samba Shared Repository
