diff options
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/include/libsmb_internal.h | 18 | ||||
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 30 |
2 files changed, 41 insertions, 7 deletions
diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h index 081bb415e5..0426430328 100644 --- a/source3/include/libsmb_internal.h +++ b/source3/include/libsmb_internal.h @@ -47,11 +47,12 @@ struct _SMBCFILE { struct smbc_internal_data { - /** INTERNAL: is this handle initialized ? + /* + * Is this handle initialized ? */ - int _initialized; + BOOL _initialized; - /** INTERNAL: dirent pointer location + /* dirent pointer location * * Leave room for any urlencoded filename and the comment field. * @@ -64,13 +65,20 @@ struct smbc_internal_data { */ char _dirent[1024]; - /** INTERNAL: server connection list + /* + * server connection list */ SMBCSRV * _servers; - /** INTERNAL: open file/dir list + /* + * open file/dir list */ SMBCFILE * _files; + + /* + * Log to standard error instead of the more typical standard output + */ + BOOL _debug_stderr; }; diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index 8cfef769e5..6eca3946d8 100644 --- a/source3/libsmb/libsmbclient.c +++ b/source3/libsmb/libsmbclient.c @@ -5938,6 +5938,27 @@ smbc_free_context(SMBCCTX *context, /* + * Each time the context structure is changed, we have binary backward + * compatibility issues. Instead of modifying the public portions of the + * context structure to add new options, instead, we put them in the internal + * portion of the context structure and provide a set function for these new + * options. + */ +void +smbc_option_set(SMBCCTX *context, + char *option_name, + void *option_value) +{ + if (strcmp(option_name, "debug_stderr") == 0) { + /* + * Log to standard error instead of standard output. + */ + context->internal->_debug_stderr = True; + } +} + + +/* * Initialise the library etc * * We accept a struct containing handle information. @@ -5982,7 +6003,12 @@ smbc_init_context(SMBCCTX *context) DEBUGLEVEL = context->debug; load_case_tables(); - setup_logging( "libsmbclient", True); + + setup_logging("libsmbclient", True); + if (context->internal->_debug_stderr) { + dbf = x_stderr; + x_setbuf(x_stderr, NULL); + } /* Here we would open the smb.conf file if needed ... */ @@ -6099,7 +6125,7 @@ smbc_init_context(SMBCCTX *context) * FIXME: Should we check the function pointers here? */ - context->internal->_initialized = 1; + context->internal->_initialized = True; return context; } |