From 1b787171fcc934a76c98fb2eff4aabaef61f0e61 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Thu, 9 Dec 1999 23:05:15 +0000 Subject: [PATCH] Place passwd extended op into builtin list. --- servers/slapd/extended.c | 1 + servers/slapd/init.c | 2 -- servers/slapd/passwd.c | 8 +------- servers/slapd/proto-slap.h | 16 ++++++++++++++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/servers/slapd/extended.c b/servers/slapd/extended.c index 9aa6f11201..55620e6109 100644 --- a/servers/slapd/extended.c +++ b/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 } }; diff --git a/servers/slapd/init.c b/servers/slapd/init.c index f9020726bc..510816798a 100644 --- a/servers/slapd/init.c +++ b/servers/slapd/init.c @@ -137,8 +137,6 @@ int slap_startup( Backend *be ) rc = sasl_init(); } - slap_passwd_init(); - return rc; } diff --git a/servers/slapd/passwd.c b/servers/slapd/passwd.c index bfeec38bf9..875bdf6fd0 100644 --- a/servers/slapd/passwd.c +++ b/servers/slapd/passwd.c @@ -18,7 +18,7 @@ #include -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, diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h index 3f3723fcb5..33d608892f 100644 --- a/servers/slapd/proto-slap.h +++ b/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, -- 2.39.5