Place passwd extended op into builtin list.

servers/slapd/extended.c

@@ -54,6 +54,7 @@ struct {
 #ifdef HAVE_TLS
 		{ LDAP_EXOP_START_TLS, starttls_extop },
 #endif
+		{ LDAP_EXOP_X_MODIFY_PASSWD, passwd_extop },
 		{ NULL, NULL }
 	};
 

servers/slapd/init.c

@@ -137,8 +137,6 @@ int slap_startup( Backend *be )
 		rc = sasl_init();
 	}
 
-	slap_passwd_init();
-
 	return rc;
 }
 

servers/slapd/passwd.c

@@ -18,7 +18,7 @@
 
 #include <lutil.h>
 
-static int passwd_main(
+int passwd_extop(
 	SLAP_EXTOP_CALLBACK_FN ext_callback,
 	Connection *conn, Operation *op, char *oid,
 	struct berval *reqdata, struct berval **rspdata, char **text )
@@ -175,12 +175,6 @@ done:
 	return rc;
 }
 
-int
-slap_passwd_init( void )
-{
-	return load_extop( LDAP_EXOP_X_MODIFY_PASSWD, passwd_main );
-}
-
 int
 slap_passwd_check(
 	Attribute *a,

servers/slapd/proto-slap.h

@@ -459,7 +459,13 @@ LIBSLAPD_F (int) dscompare LDAP_P(( const char *s1, const char *s2del, char deli
  * starttls.c
  */
 
-LIBSLAPD_F (int) starttls_extop LDAP_P(( SLAP_EXTOP_CALLBACK_FN, Connection *conn, Operation *op, char * oid, struct berval * reqdata, struct berval ** rspdata, char ** text ));
+LIBSLAPD_F (int) starttls_extop LDAP_P((
+	SLAP_EXTOP_CALLBACK_FN,
+	Connection *conn, Operation *op,
+	char * oid,
+	struct berval * reqdata,
+	struct berval ** rspdata,
+	char ** text ));
 
 
 /*
@@ -493,7 +499,13 @@ LIBSLAPD_F (void) slap_init_user LDAP_P(( char *username, char *groupname ));
 /*
  * passwd.c
  */
-LIBSLAPD_F (int) slap_passwd_init( void );
+LIBSLAPD_F (int) passwd_extop LDAP_P((
+	SLAP_EXTOP_CALLBACK_FN,
+	Connection *conn, Operation *op,
+	char * oid,
+	struct berval * reqdata,
+	struct berval ** rspdata,
+	char ** text ));
 
 LIBSLAPD_F (int) slap_passwd_check(
 	Attribute			*attr,