cleanup

[openldap] / libraries / liblutil / sasl.c

diff --git a/libraries/liblutil/sasl.c b/libraries/liblutil/sasl.c
index 725daa7f35ab6f50371d610fce7045c3af82ea1e..a1308a8018deb8cd52e6a1a89ad02a14b7f6e8fa 100644 (file)
--- a/libraries/liblutil/sasl.c
+++ b/libraries/liblutil/sasl.c
@@ -13,7 +13,11 @@
 #include <ac/string.h>
 #include <ac/unistd.h>
 
+#ifdef HAVE_SASL_SASL_H
+#include <sasl/sasl.h>
+#else
 #include <sasl.h>
+#endif
 
 #include <ldap.h>
 #include "lutil_ldap.h"
@@ -122,7 +126,7 @@ static int interaction(
                fprintf( stderr, "Default: %s\n", dflt );
        }
 
-       sprintf( input, "%s: ",
+       snprintf( input, sizeof input, "%s: ",
                interact->prompt ? interact->prompt : "Interact" );
 
        if( noecho ) {
@@ -155,7 +159,7 @@ static int interaction(
 
        if( interact->len > 0 ) {
                /* duplicate */
-               char *p = interact->result;
+               char *p = (char *)interact->result;
                interact->result = strdup( p );
 
                /* zap */