RE: saslauxprop and libldapdb, auxpropfunc error -7

["Howard Chu" <hyc@highlandsun.com>]

This would be better, I think:
Index: client.c
===================================================================
RCS file: /cvs/src/sasl/lib/client.c,v
retrieving revision 1.58
diff -u -r1.58 client.c
--- client.c    13 Feb 2003 19:55:53 -0000      1.58
+++ client.c    6 Mar 2003 15:02:34 -0000
@@ -210,7 +210,7 @@

   sasl_client_add_plugin("EXTERNAL", &external_client_plug_init);

-  ret = _sasl_common_init();
+  ret = _sasl_common_init(&global_callbacks);

   if (ret == SASL_OK)
       ret = _sasl_load_plugins(ep_list,
Index: common.c
===================================================================
RCS file: /cvs/src/sasl/lib/common.c,v
retrieving revision 1.89
diff -u -r1.89 common.c
--- common.c    13 Feb 2003 19:55:54 -0000      1.89
+++ common.c    6 Mar 2003 15:02:35 -0000
@@ -413,13 +413,13 @@
   RETURN(conn, SASL_OK);
 }

-int _sasl_common_init(void)
+int _sasl_common_init(sasl_global_callbacks_t *global_callbacks)
 {
     int result;

     /* Setup the global utilities */
     if(!sasl_global_utils) {
-       sasl_global_utils = _sasl_alloc_utils(NULL, NULL);
+       sasl_global_utils = _sasl_alloc_utils(NULL, global_callbacks);
        if(sasl_global_utils == NULL) return SASL_NOMEM;
     }

Index: saslint.h
===================================================================
RCS file: /cvs/src/sasl/lib/saslint.h,v
retrieving revision 1.46
diff -u -r1.46 saslint.h
--- saslint.h   13 Feb 2003 19:55:54 -0000      1.46
+++ saslint.h   6 Mar 2003 15:02:36 -0000
@@ -358,7 +358,7 @@
 extern const sasl_callback_t *
 _sasl_find_verifyfile_callback(const sasl_callback_t *callbacks);

-extern int _sasl_common_init(void);
+extern int _sasl_common_init(sasl_global_callbacks_t *global_callbacks);

 extern int _sasl_conn_init(sasl_conn_t *conn,
                           const char *service,
Index: server.c
===================================================================
RCS file: /cvs/src/sasl/lib/server.c,v
retrieving revision 1.119
diff -u -r1.119 server.c
--- server.c    13 Feb 2003 19:55:54 -0000      1.119
+++ server.c    6 Mar 2003 15:02:37 -0000
@@ -585,7 +585,7 @@
     /* we require the appname to be non-null */
     if (appname==NULL) return SASL_BADPARAM;

-    ret = _sasl_common_init();
+    ret = _sasl_common_init(&global_callbacks);
     if (ret != SASL_OK)
        return ret;


  -- Howard Chu
  Chief Architect, Symas Corp.       Director, Highland Sun
  http://www.symas.com               http://highlandsun.com/hyc
  Symas: Premier OpenSource Development and Support 

> -----Original Message-----
> From: Rob Siemborski [mailto:rjs3@andrew.cmu.edu]
> Sent: Thursday, March 06, 2003 6:28 AM
> To: Howard Chu
> Cc: 'Igor Brezac'; 'Joe Rhodes'; OpenLDAP-software@OpenLDAP.org;
> cyrus-sasl@lists.andrew.cmu.edu
> Subject: RE: saslauxprop and libldapdb, auxpropfunc error -7
> 
> 
> On Thu, 6 Mar 2003, Howard Chu wrote:
> 
> > I take that all back. There's still something broken, I 
> just haven't found it
> > yet, and I've been up far too late tonight to say anything 
> coherent about it
> > now.
> 
> The library always hands plugins the internal getopt function 
> because it
> performs getopt lookups by calling both the connection-specific getopt
> function and the global getopt function (as well as potentially an
> application-specific config file).  Handing the getopt 
> callback directly
> to the plugin won't accomplish this.
> 
> If you do fingure out what trouble you're having, though, let us know.
> 
> -Rob
> 
> -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
> Rob Siemborski * Andrew Systems Group * Cyert Hall 207 * 412-268-7456
> Research Systems Programmer * /usr/contributed Gatekeeper
>