Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / contrib / slapd-modules / nssov / nssov.h

diff --git a/contrib/slapd-modules/nssov/nssov.h b/contrib/slapd-modules/nssov/nssov.h
index 27c579e05fc136d5d545f2da04f7c1142d338b8d..7ef6993a6dcd8691340c859ff8b39d61e28558bd 100644 (file)
--- a/contrib/slapd-modules/nssov/nssov.h
+++ b/contrib/slapd-modules/nssov/nssov.h
@@ -2,8 +2,9 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2008-2009 The OpenLDAP Foundation.
+ * Copyright 2008-2014 The OpenLDAP Foundation.
  * Portions Copyright 2008 Howard Chu.
+ * Portions Copyright 2013 Ted C. Cheng, Symas Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -29,9 +30,9 @@
 #include <stdio.h>
 
 #include "nslcd.h"
-#include "nslcd-common.h"
-#include "common/tio.h"
-#include "compat/attrs.h"
+#include "nslcd-prot.h"
+#include "tio.h"
+#include "attrs.h"
 
 #undef PACKAGE_BUGREPORT
 #undef PACKAGE_NAME
@@ -88,6 +89,9 @@ typedef struct nssov_info
        struct berval ni_pam_template;
        struct berval ni_pam_defhost;
        struct berval *ni_pam_sessions;
+       struct berval ni_pam_password_prohibit_message;
+       struct berval ni_pam_pwdmgr_dn;
+       struct berval ni_pam_pwdmgr_pwd;
 } nssov_info;
 
 #define NI_PAM_USERHOST                1       /* old style host checking */
@@ -323,6 +327,7 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op);
     /* do the internal search */ \
        op->o_bd->be_search( op, &rs ); \
        filter_free_x( op, op->ors_filter, 1 ); \
+       WRITE_INT32(fp,NSLCD_RESULT_END); \
     return 0; \
   }