summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2008-01-10 11:13:23 +0100
committerGünther Deschner <gd@samba.org>2008-01-10 13:02:10 +0100
commit83b1751615ef3892d44c7826228fbb3b0826d2b2 (patch)
tree578971e85b4dabdd4a2b938f8a5b99661a88c4bc
parent138954e70e18e53f1ae81bad4641380bc8ab3bd3 (diff)
downloadsamba-83b1751615ef3892d44c7826228fbb3b0826d2b2.tar.gz
samba-83b1751615ef3892d44c7826228fbb3b0826d2b2.tar.bz2
samba-83b1751615ef3892d44c7826228fbb3b0826d2b2.zip
Remove unused string.
Guenther (This used to be commit 88d6683872f4bb9c3074280f385f73c7af9de784)
-rw-r--r--examples/libsmbclient/Makefile4
-rw-r--r--source3/utils/net_ads.c3
2 files changed, 2 insertions, 5 deletions
diff --git a/examples/libsmbclient/Makefile b/examples/libsmbclient/Makefile
index be383aea67..6500707e75 100644
--- a/examples/libsmbclient/Makefile
+++ b/examples/libsmbclient/Makefile
@@ -5,7 +5,7 @@ SAMBA_INCL = ../../source/include
EXTLIB_INCL = -I/usr/include/gtk-1.2 \
-I/usr/include/glib-1.2 \
-I/usr/lib/glib/include
-
+EXTLIB_INCL = `gtk-config --cflags`
DEFS = -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE
CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
@@ -13,7 +13,7 @@ CFLAGS = -O0 -g -I$(SAMBA_INCL) $(EXTLIB_INCL) $(DEFS)
LDFLAGS = -L/usr/local/samba/lib \
-lldap -lkrb5 -lgssapi_krb5
#LIBSMBCLIENT = /usr/local/samba/lib/libsmbclient.so
-LIBSMBCLIENT = ../../source/bin/libsmbclient.a -ldl -lresolv
+LIBSMBCLIENT = -lsmbclient -ldl -lresolv
TESTS= testsmbc \
testacl \
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 310af82beb..80f6ba9001 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -1446,7 +1446,6 @@ int net_ads_join(int argc, const char **argv)
ADS_STRUCT *ads = NULL;
ADS_STATUS status;
NTSTATUS nt_status;
- char *machine_account = NULL;
char *short_domain_name = NULL;
char *tmp_password, *password;
TALLOC_CTX *ctx = NULL;
@@ -1684,7 +1683,6 @@ int net_ads_join(int argc, const char **argv)
d_printf("Joined '%s' to realm '%s'\n", global_myname(), ads->server.realm);
- SAFE_FREE(machine_account);
TALLOC_FREE( ctx );
ads_destroy(&ads);
@@ -1694,7 +1692,6 @@ fail:
/* issue an overall failure message at the end. */
d_printf("Failed to join domain: %s\n", get_friendly_nt_error_msg(nt_status));
- SAFE_FREE(machine_account);
TALLOC_FREE( ctx );
ads_destroy(&ads);