[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-351-g30c9e35

[Gerald (Jerry) Carter]

The branch, v3-2-test has been updated
       via  30c9e3557bf4ca0b85e15bd7cc883391aec42f1f (commit)
       via  6b62b7dbab559ffc0047790c7ec68c1b30f0eff0 (commit)
      from  6f9c2910bdda605f90967e0aa6a84b8094f3a197 (commit)

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


- Log -----------------------------------------------------------------
commit 30c9e3557bf4ca0b85e15bd7cc883391aec42f1f
Author: Gerald (Jerry) Carter <[EMAIL PROTECTED]>
Date:   Wed Nov 21 10:27:22 2007 -0600

    Allocate a talloc_stackframe() in main() for wbinfo.

commit 6b62b7dbab559ffc0047790c7ec68c1b30f0eff0
Author: Gerald (Jerry) Carter <[EMAIL PROTECTED]>
Date:   Wed Nov 21 10:27:01 2007 -0600

    Fix unresolved symbols in smbumount from addition of talloc_stackframe().

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

Summary of changes:
 source/Makefile.in       |    5 +++--
 source/nsswitch/wbinfo.c |    4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile.in b/source/Makefile.in
index 0ed7b4e..db6f123 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -735,7 +735,8 @@ MOUNT_OBJ = client/smbmount.o \
 
 MNT_OBJ = client/smbmnt.o $(VERSION_OBJ) $(LIBREPLACE_OBJ) 
$(SOCKET_WRAPPER_OBJ)
 
-UMOUNT_OBJ = client/smbumount.o $(SOCKET_WRAPPER_OBJ)
+UMOUNT_OBJ = client/smbumount.o $(SOCKET_WRAPPER_OBJ) $(PARAM_OBJ) 
$(LIBSMB_OBJ) \
+            $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(SECRETS_OBJ)
 
 CIFS_MOUNT_OBJ = client/mount.cifs.o
 
@@ -1188,7 +1189,7 @@ bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(MNT_OBJ)
 
 bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(UMOUNT_OBJ)
        @echo Linking $@
-       @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS)
+       @$(CC) $(FLAGS) -o $@ $(UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) 
$(KRB5LIBS) $(LDAP_LIBS)
 
 bin/[EMAIL PROTECTED]@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ)
        @echo Linking $@
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 2a1fe61..488a080 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -1273,7 +1273,7 @@ enum {
 int main(int argc, char **argv, char **envp)
 {
        int opt;
-
+       TALLOC_CTX *frame = talloc_stackframe();        
        poptContext pc;
        static char *string_arg;
        static char *opt_domain_name;
@@ -1613,6 +1613,8 @@ int main(int argc, char **argv, char **envp)
        /* Exit code */
 
  done:
+       talloc_destroy(frame);
+
        poptFreeContext(pc);
        return result;
 }


-- 
Samba Shared Repository