Install *.schema only

[openldap] / servers / slapd / passwd.c

diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c
index 0f557c2f0f0ff763e315879b99ff9efca9a2f651..8246f559652463bfa3a714d7f569ac0a4322c196 100644 (file)
--- a/servers/slapd/passwd.c
+++ b/servers/slapd/passwd.c
@@ -1,7 +1,7 @@
 /* bind.c - ldbm backend bind and unbind routines */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -21,12 +21,12 @@
 int passwd_extop(
        SLAP_EXTOP_CALLBACK_FN ext_callback,
        Connection *conn, Operation *op,
-       char *reqoid,
+       const char *reqoid,
        struct berval *reqdata,
        char **rspoid,
        struct berval **rspdata,
        LDAPControl ***rspctrls,
-       char **text,
+       const char **text,
        struct berval ***refs )
 {
        int rc;
@@ -68,9 +68,9 @@ int passwd_extop(
 
 int slap_passwd_parse( struct berval *reqdata,
        struct berval **id,
-       struct berval **old,
-       struct berval **new,
-       char **text )
+       struct berval **oldpass,
+       struct berval **newpass,
+       const char **text )
 {
        int rc = LDAP_SUCCESS;
        ber_tag_t tag;
@@ -117,7 +117,7 @@ int slap_passwd_parse( struct berval *reqdata,
        }
 
        if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_OLD ) {
-               if( old == NULL ) {
+               if( oldpass == NULL ) {
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD not allowed.\n",
                                0, 0, 0 );
                        *text = "use bind to verify old password";
@@ -125,7 +125,7 @@ int slap_passwd_parse( struct berval *reqdata,
                        goto done;
                }
 
-               tag = ber_scanf( ber, "O", old );
+               tag = ber_scanf( ber, "O", oldpass );
 
                if( tag == LBER_ERROR ) {
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: ID parse failed.\n",
@@ -137,7 +137,7 @@ int slap_passwd_parse( struct berval *reqdata,
        }
 
        if( tag == LDAP_TAG_EXOP_X_MODIFY_PASSWD_NEW ) {
-               if( new == NULL ) {
+               if( newpass == NULL ) {
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: NEW not allowed.\n",
                                0, 0, 0 );
                        *text = "user specified passwords disallowed";
@@ -145,7 +145,7 @@ int slap_passwd_parse( struct berval *reqdata,
                        goto done;
                }
 
-               tag = ber_scanf( ber, "O", new );
+               tag = ber_scanf( ber, "O", newpass );
 
                if( tag == LBER_ERROR ) {
                        Debug( LDAP_DEBUG_TRACE, "slap_passwd_parse: OLD parse failed.\n",
@@ -173,14 +173,14 @@ done:
                        *id = NULL;
                }
 
-               if( old != NULL ) {
-                       ber_bvfree( *old );
-                       *old = NULL;
+               if( oldpass != NULL ) {
+                       ber_bvfree( *oldpass );
+                       *oldpass = NULL;
                }
 
-               if( new != NULL ) {
-                       ber_bvfree( *new );
-                       *new = NULL;
+               if( newpass != NULL ) {
+                       ber_bvfree( *newpass );
+                       *newpass = NULL;
                }
        }