summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-02-28 16:36:11 +0000
committerGerald Carter <jerry@samba.org>2003-02-28 16:36:11 +0000
commit88ab4a0d42baf8f0f0bd2a0e22c8f5721dc5b64d (patch)
tree860e81822263d8adc3d2260e45fcf5cc40072b13
parent8c6776ae0ff1d09e5ac56381955e62403dd0b0b5 (diff)
downloadsamba-88ab4a0d42baf8f0f0bd2a0e22c8f5721dc5b64d.tar.gz
last sync with SAMBA_2_2 for the 2.2.8pre2 release
-rw-r--r--source/rpc_server/srv_spoolss_nt.c2
-rw-r--r--source/web/diagnose.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/source/rpc_server/srv_spoolss_nt.c b/source/rpc_server/srv_spoolss_nt.c
index a2a38afc68f..8ec442a6556 100644
--- a/source/rpc_server/srv_spoolss_nt.c
+++ b/source/rpc_server/srv_spoolss_nt.c
@@ -7874,8 +7874,6 @@ WERROR _spoolss_enumprinterkey(pipes_struct *p, SPOOL_Q_ENUMPRINTERKEY *q_u, SPO
{
fstring key;
uint16 enumkeys[ENUMERATED_KEY_SIZE+1];
- char* ptr = NULL;
- int i;
fstring PrinterKey;
UNISTR2 uni_keys;
int enum_key_len;
diff --git a/source/web/diagnose.c b/source/web/diagnose.c
index efe1ef5a2c4..97ca1c60151 100644
--- a/source/web/diagnose.c
+++ b/source/web/diagnose.c
@@ -57,7 +57,7 @@ BOOL smbd_running(void)
if (!cli_initialise(&cli))
return False;
- if (!cli_connect(&cli, "localhost", &loopback_ip)) {
+ if (!cli_connect(&cli, global_myname(), &loopback_ip)) {
cli_shutdown(&cli);
return False;
}