r24943: Some stackframes

(This used to be commit cddb9f11d5fafcd3797cb242775c37f0c04d4f15)

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 8bb80239174e5e273a912b19a524f0e51b19aa94..bf158fe4a06258197e1102eafa4044f2aaeb8077 100644 (file)
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -193,6 +193,7 @@ int main(int argc,char *argv[])
   static BOOL find_master=False;
   static BOOL lookup_by_ip = False;
   poptContext pc;
+  TALLOC_CTX *frame = talloc_stackframe();
 
   struct poptOption long_options[] = {
          POPT_AUTOHELP
@@ -292,6 +293,6 @@ int main(int argc,char *argv[])
   }
 
   poptFreeContext(pc);
-
+  TALLOC_FREE(frame);
   return(0);
 }

diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index c5a132a55d1cf7decc815532766bd0261dd0c6ec..cea2cd7cfaa51377b7f09961c39501976a0c4f35 100644 (file)
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -758,6 +758,7 @@ int main (int argc, char **argv)
        static BOOL pw_from_stdin = False;
        struct pdb_methods *bin, *bout, *bdef;
        char *configfile = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
        poptContext pc;
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -798,6 +799,7 @@ int main (int argc, char **argv)
        /* we shouldn't have silly checks like this */
        if (getuid() != 0) {
                d_fprintf(stderr, "You must be root to use pdbedit\n");
+               TALLOC_FREE(frame);
                return -1;
        }
        
@@ -1050,5 +1052,6 @@ int main (int argc, char **argv)
        }
        poptPrintHelp(pc, stderr, 0);
 
+       TALLOC_FREE(frame);
        return 1;
 }

diff --git a/source3/utils/sharesec.c b/source3/utils/sharesec.c
index a1774d698eb764b07fc702471f5eee16fac0d4f2..45bde5cf8e335c41f884c71156f652862dbbe9ab 100644 (file)
--- a/source3/utils/sharesec.c
+++ b/source3/utils/sharesec.c
@@ -507,7 +507,7 @@ int main(int argc, const char *argv[])
                { NULL }
        };
 
-       if ( !(ctx = talloc_init("main")) ) {
+       if ( !(ctx = talloc_stackframe()) ) {
                fprintf( stderr, "Failed to initialize talloc context!\n");
                return -1;
        }

diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index db81b447a18ca238ab9b94b2ca510f1e0e66df4c..6324dcc19270884b12bb921a5fa952f4c08d09fb 100644 (file)
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -824,7 +824,7 @@ static struct cli_state *connect_one(const char *share)
 
        load_case_tables();
 
-       ctx=talloc_init("main");
+       ctx=talloc_stackframe();
 
        /* set default debug level to 1 regardless of what smb.conf sets */
        setup_logging( "smbcacls", True );

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index 70d28a7e4a3991cb5d4363b41fc46a9c50eb9cb4..8d954ac20ae93e5bdb03156719ed3ac91b4e6cab 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -401,6 +401,7 @@ static struct cli_state *connect_one(const char *share)
        struct cli_state *cli;
        BOOL fix_user = False;
        SMB_NTQUOTA_STRUCT qt;
+       TALLOC_CTX *frame = talloc_stackframe();
        poptContext pc;
        struct poptOption long_options[] = {
                POPT_AUTOHELP
@@ -544,6 +545,8 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
                        break;
        }
 
+       talloc_free(frame);
+
        return result;
 }
 

diff --git a/source3/utils/smbfilter.c b/source3/utils/smbfilter.c
index 450adc41ef3c40071049cc2a93152667e331a021..b3c038c0cf1fb43c1a9343d1b4b91732e42fec0d 100644 (file)
--- a/source3/utils/smbfilter.c
+++ b/source3/utils/smbfilter.c
@@ -220,6 +220,7 @@ int main(int argc, char *argv[])
 {
        char *desthost;
        pstring configfile;
+       TALLOC_CTX *frame = talloc_stackframe();
 
        setup_logging(argv[0],True);
   
@@ -240,5 +241,6 @@ int main(int argc, char *argv[])
        }
 
        start_filter(desthost);
+       TALLOC_FREE(frame);
        return 0;
 }

diff --git a/source3/utils/smbget.c b/source3/utils/smbget.c
index 5848fd4057ecc181b421f77b9db528a25ef5f189..ac662e6aceea079dafff035fdc81bd499a0d3930 100644 (file)
--- a/source3/utils/smbget.c
+++ b/source3/utils/smbget.c
@@ -521,6 +521,7 @@ int main(int argc, const char **argv)
        int c = 0;
        const char *file = NULL;
        char *rcfile = NULL;
+       TALLOC_CTX *frame = talloc_stackframe();
        struct poptOption long_options[] = {
                {"guest", 'a', POPT_ARG_NONE, NULL, 'a', "Work as user guest" },        
                {"resume", 'r', POPT_ARG_NONE, &_resume, 0, "Automatically resume aborted files" },
@@ -597,6 +598,6 @@ int main(int argc, const char **argv)
        }
 
        clean_exit();
-
+       TALLOC_FREE(frame);
        return 0;
 }

diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 1da9b5e5288c4e4e7693c2d8f4996bf4b920fe7d..f1a23870900d2717bba53e18099a06c6da2c0919 100644 (file)
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -550,7 +550,9 @@ static int process_nonroot(int local_flags)
 **********************************************************/
 int main(int argc, char **argv)
 {      
+       TALLOC_CTX *frame = talloc_stackframe();
        int local_flags = 0;
+       int ret;
        
        AllowDebugChange = False;
 
@@ -587,5 +589,7 @@ int main(int argc, char **argv)
                return process_root(local_flags);
        } 
 
-       return process_nonroot(local_flags);
+       ret = process_nonroot(local_flags);
+       TALLOC_FREE(frame);
+       return ret;
 }

diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index b30ce08c5a4166f82669e8536086513a69ffd0d2..a29aa52fefeeefd068b7f58238c9e0e2681523ff 100644 (file)
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -249,6 +249,7 @@ static BOOL print_tree(struct user_auth_info *user_info)
 ****************************************************************************/
  int main(int argc,char *argv[])
 {
+       TALLOC_CTX *frame = talloc_stackframe();
        struct poptOption long_options[] = {
                POPT_AUTOHELP
                { "broadcast", 'b', POPT_ARG_VAL, &use_bcast, True, "Use broadcast instead of using the master browser" },
@@ -289,8 +290,11 @@ static BOOL print_tree(struct user_auth_info *user_info)
 
        /* Now do our stuff */
 
-        if (!print_tree(&cmdline_auth_info))
+        if (!print_tree(&cmdline_auth_info)) {
+               TALLOC_FREE(frame);
                 return 1;
+       }
 
+       TALLOC_FREE(frame);
        return 0;
 }