4 files changed, 34 insertions, 3 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index dc675037a0..fdbd54fafb 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -154,6 +154,7 @@ static const char *default_classname_table[] = {
 	"auth",              /* DBGC_AUTH         */
 	"winbind",           /* DBGC_WINBIND      */
 	"vfs",		     /* DBGC_VFS	  */
+	"idmap",	     /* DBGC_IDMAP	  */
 	NULL
 };
 
diff --git a/source3/lib/readline.c b/source3/lib/readline.c
index 8b90c32c7f..ceb02ef749 100644
--- a/source3/lib/readline.c
+++ b/source3/lib/readline.c
@@ -116,6 +116,29 @@ char *smb_readline(char *prompt, void (*callback)(void),
 }
 
 /****************************************************************************
+ * return line buffer text
+ ****************************************************************************/
+const char *smb_readline_get_line_buffer(void)
+{
+#if defined(HAVE_LIBREADLINE)
+	return rl_line_buffer;
+#else
+	return NULL;
+#endif
+}
+
+
+/****************************************************************************
+ * set completion append character
+ ***************************************************************************/
+void smb_readline_ca_char(char c)
+{
+#if defined(HAVE_LIBREADLINE)
+	rl_completion_append_character = c;
+#endif
+}
+
+/****************************************************************************
 history
 ****************************************************************************/
 int cmd_history(void)
@@ -135,3 +158,4 @@ int cmd_history(void)
 
 	return 0;
 }
+
diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c
index 02cf782520..4aef82c7d8 100644
--- a/source3/lib/snprintf.c
+++ b/source3/lib/snprintf.c
@@ -83,6 +83,12 @@
  *    Remove NO_CONFIG_H so that the test case can be built within a source
  *    tree with less trouble.
  *    Remove unnecessary SAFE_FREE() definition.
+ *
+ * Martin Pool (mbp@samba.org) May 2003
+ *    Put in a prototype for dummy_snprintf() to quiet compiler warnings.
+ *
+ *    Move #endif to make sure VA_COPY, LDOUBLE, etc are defined even
+ *    if the C library has some snprintf functions already.
  **************************************************************/
 
 #ifndef NO_CONFIG_H
@@ -123,8 +129,9 @@
 /* only include stdio.h if we are not re-defining snprintf or vsnprintf */
 #include <stdio.h>
  /* make the compiler happy with an empty file */
+ void dummy_snprintf(void);
  void dummy_snprintf(void) {} 
-#else
+#endif /* HAVE_SNPRINTF, etc */
 
 #ifdef HAVE_LONG_DOUBLE
 #define LDOUBLE long double
@@ -144,7 +151,6 @@
 #else
 #define VA_COPY(dest, src) (dest) = (src)
 #endif
-#endif
 
 static size_t dopr(char *buffer, size_t maxlen, const char *format, 
 		   va_list args_in);
diff --git a/source3/lib/username.c b/source3/lib/username.c
index b8f33494ee..d8f4ff80ed 100644
--- a/source3/lib/username.c
+++ b/source3/lib/username.c
@@ -339,7 +339,7 @@ static BOOL user_in_winbind_group_list(const char *user, const char *gname, BOOL
  		goto err;
  	}
 
-	if (!lp_winbind_gid(&gid_low, &gid_high)) {
+	if (!lp_idmap_gid(&gid_low, &gid_high)) {
 		DEBUG(4, ("winbind gid range not configured, therefore %s cannot be a winbind group\n", gname));
  		goto err;
 	}