r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[tprouty/samba.git] / source / utils / net_rpc_join.c

diff --git a/source/utils/net_rpc_join.c b/source/utils/net_rpc_join.c
index 6bfeedc8a0c1ad9d02f719d1a893fa4d53fdcc40..79c632f8314d37b78a227ced1b4fc3e8e6ad2007 100644 (file)
--- a/source/utils/net_rpc_join.c
+++ b/source/utils/net_rpc_join.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 
@@ -42,7 +42,7 @@
  * @return A shell status integer (0 for success)
  *
  **/
-int net_rpc_join_ok(const char *domain)
+static int net_rpc_join_ok(const char *domain)
 {
        struct cli_state *cli;
        uchar stored_md4_trust_password[16];
@@ -258,7 +258,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
        { 
                char *str;
                str = generate_random_str(DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH);
-               clear_trust_password = strdup(str);
+               clear_trust_password = SMB_STRDUP(str);
                E_md4hash(clear_trust_password, md4_trust_password);
        }