[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1247-g88d6683

[Günther Deschner]

The branch, v3-2-test has been updated
       via  88d6683872f4bb9c3074280f385f73c7af9de784 (commit)
      from  ee905a085fff5410d02c3e5fa2664e989de4afd4 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 88d6683872f4bb9c3074280f385f73c7af9de784
Author: Günther Deschner <[EMAIL PROTECTED]>
Date:   Thu Jan 10 11:13:23 2008 +0100

    Remove unused string.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 examples/libsmbclient/Makefile |    4 ++--
 source/utils/net_ads.c         |    3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/examples/libsmbclient/Makefile b/examples/libsmbclient/Makefile
index be383ae..6500707 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/source/utils/net_ads.c b/source/utils/net_ads.c
index 310af82..80f6ba9 100644
--- a/source/utils/net_ads.c
+++ b/source/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);
 


-- 
Samba Shared Repository