/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* ACKNOWLEDGEMENTS:
+ * This program was orignally developed by Kurt D. Zeilenga for inclusion in
+ * OpenLDAP Software.
*/
#include "portable.h"
#include "ldap-int.h"
/*
- * LDAP Password Modify (Extended) Operation <RFC 3???>
+ * LDAP Password Modify (Extended) Operation <RFC 3062>
*/
int ldap_parse_passwd(
LDAP *ld,
LDAPMessage *res,
- struct berval **newpasswd )
+ struct berval *newpasswd )
{
int rc;
char *retoid = NULL;
assert( res != NULL );
assert( newpasswd != NULL );
- *newpasswd = NULL;
+ newpasswd->bv_val = NULL;
+ newpasswd->bv_len = 0;
rc = ldap_parse_extended_result( ld, res, &retoid, &retdata, 0 );
ber_printf( ber, "{" /*}*/ );
if( user != NULL ) {
- ber_printf( ber, "ts",
+ ber_printf( ber, "tO",
LDAP_TAG_EXOP_MODIFY_PASSWD_ID, user );
}
if( oldpw != NULL ) {
- ber_printf( ber, "ts",
+ ber_printf( ber, "tO",
LDAP_TAG_EXOP_MODIFY_PASSWD_OLD, oldpw );
}
if( newpw != NULL ) {
- ber_printf( ber, "ts",
+ ber_printf( ber, "tO",
LDAP_TAG_EXOP_MODIFY_PASSWD_NEW, newpw );
}
struct berval *user,
struct berval *oldpw,
struct berval *newpw,
- struct berval **newpasswd,
+ struct berval *newpasswd,
LDAPControl **sctrls,
LDAPControl **cctrls )
{