Fix bug 6514: net gives unhelpful "lp_load failed" when it's missing smb.conf

[metze/samba/wip.git] / source3 / lib / netapi / netapi.c

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index 82a8a8d3cd814278340abe7441258e58d5cae59c..2f8474b37fdd0598abd1cb2e46aa10a87f9194fe 100644 (file)
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "lib/netapi/netapi.h"
+#include "lib/netapi/netapi_private.h"
 
 extern bool AllowDebugChange;
 
@@ -29,8 +30,30 @@ static bool libnetapi_initialized = false;
 /****************************************************************
 ****************************************************************/
 
+static NET_API_STATUS libnetapi_init_private_context(struct libnetapi_ctx *ctx)
+{
+       struct libnetapi_private_ctx *priv;
+
+       if (!ctx) {
+               return W_ERROR_V(WERR_INVALID_PARAM);
+       }
+
+       priv = TALLOC_ZERO_P(ctx, struct libnetapi_private_ctx);
+       if (!priv) {
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
+       ctx->private_data = priv;
+
+       return NET_API_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
 NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 {
+       NET_API_STATUS status;
        struct libnetapi_ctx *ctx = NULL;
        char *krb5_cc_env = NULL;
 
@@ -39,7 +62,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
                return NET_API_STATUS_SUCCESS;
        }
 
-#ifdef DEVELOPER
+#if 0
        talloc_enable_leak_report();
 #endif
        frame = talloc_stackframe();
@@ -53,6 +76,9 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
        if (!DEBUGLEVEL) {
                DEBUGLEVEL = 0;
        }
+
+       /* prevent setup_logging() from closing x_stderr... */
+       dbf = 0;
        setup_logging("libnetapi", true);
 
        dbf = x_stderr;
@@ -63,7 +89,7 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
 
        if (!lp_load(get_dyn_CONFIGFILE(), true, false, false, false)) {
                TALLOC_FREE(frame);
-               fprintf(stderr, "lp_load failed\n");
+               fprintf(stderr, "error loading %s\n", get_dyn_CONFIGFILE() );
                return W_ERROR_V(WERR_GENERAL_FAILURE);
        }
 
@@ -81,6 +107,23 @@ NET_API_STATUS libnetapi_init(struct libnetapi_ctx **context)
                setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
        }
 
+       if (getenv("USER")) {
+               ctx->username = talloc_strdup(frame, getenv("USER"));
+       } else {
+               ctx->username = talloc_strdup(frame, "");
+       }
+       if (!ctx->username) {
+               TALLOC_FREE(frame);
+               fprintf(stderr, "libnetapi_init: out of memory\n");
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
+       status = libnetapi_init_private_context(ctx);
+       if (status != 0) {
+               TALLOC_FREE(frame);
+               return status;
+       }
+
        libnetapi_initialized = true;
 
        *context = stat_ctx = ctx;
@@ -106,6 +149,13 @@ NET_API_STATUS libnetapi_getctx(struct libnetapi_ctx **ctx)
 
 NET_API_STATUS libnetapi_free(struct libnetapi_ctx *ctx)
 {
+       if (!ctx) {
+               return NET_API_STATUS_SUCCESS;
+       }
+
+       libnetapi_samr_free(ctx);
+
+       libnetapi_shutdown_cm(ctx);
 
        if (ctx->krb5_cc_env) {
                char *env = getenv(KRB5_ENV_CCNAME);
@@ -162,7 +212,8 @@ NET_API_STATUS libnetapi_set_username(struct libnetapi_ctx *ctx,
                                      const char *username)
 {
        TALLOC_FREE(ctx->username);
-       ctx->username = talloc_strdup(ctx, username);
+       ctx->username = talloc_strdup(ctx, username ? username : "");
+
        if (!ctx->username) {
                return W_ERROR_V(WERR_NOMEM);
        }
@@ -194,6 +245,15 @@ NET_API_STATUS libnetapi_set_workgroup(struct libnetapi_ctx *ctx,
 /****************************************************************
 ****************************************************************/
 
+NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx)
+{
+       ctx->use_kerberos = true;
+       return NET_API_STATUS_SUCCESS;
+}
+
+/****************************************************************
+****************************************************************/
+
 const char *libnetapi_errstr(NET_API_STATUS status)
 {
        if (status & 0xc0000000) {
@@ -227,8 +287,9 @@ NET_API_STATUS libnetapi_set_error_string(struct libnetapi_ctx *ctx,
 ****************************************************************/
 
 const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
-                                      NET_API_STATUS status)
+                                      NET_API_STATUS status_in)
 {
+       NET_API_STATUS status;
        struct libnetapi_ctx *tmp_ctx = ctx;
 
        if (!tmp_ctx) {
@@ -242,7 +303,34 @@ const char *libnetapi_get_error_string(struct libnetapi_ctx *ctx,
                return tmp_ctx->error_string;
        }
 
-       return libnetapi_errstr(status);
+       return libnetapi_errstr(status_in);
+}
+
+/****************************************************************
+****************************************************************/
+
+NET_API_STATUS NetApiBufferAllocate(uint32_t byte_count,
+                                   void **buffer)
+{
+       void *buf = NULL;
+
+       if (!buffer) {
+               return W_ERROR_V(WERR_INSUFFICIENT_BUFFER);
+       }
+
+       if (byte_count == 0) {
+               goto done;
+       }
+
+       buf = talloc_size(NULL, byte_count);
+       if (!buf) {
+               return W_ERROR_V(WERR_NOMEM);
+       }
+
+ done:
+       *buffer = buf;
+
+       return NET_API_STATUS_SUCCESS;
 }
 
 /****************************************************************