Commit da516d96 authored by Howard Chu's avatar Howard Chu
Browse files

sync with HEAD: loginStatus is now user attr, not operational

parent 1f30e425
# $OpenLDAP$ # $OpenLDAP$
# $Id: ldapns.schema,v 1.3 2009-10-01 19:17:20 tedcheng Exp $
# LDAP Name Service Additional Schema # LDAP Name Service Additional Schema
# http://www.iana.org/assignments/gssapi-service-names # http://www.iana.org/assignments/gssapi-service-names
...@@ -11,6 +12,13 @@ attributetype ( 1.3.6.1.4.1.5322.17.2.1 NAME 'authorizedService' ...@@ -11,6 +12,13 @@ attributetype ( 1.3.6.1.4.1.5322.17.2.1 NAME 'authorizedService'
EQUALITY caseIgnoreMatch EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} ) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
attributetype ( 1.3.6.1.4.1.5322.17.2.2 NAME 'loginStatus'
DESC 'Currently logged in sessions for a user'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
ORDERING caseIgnoreOrderingMatch
SYNTAX OMsDirectoryString )
objectclass ( 1.3.6.1.4.1.5322.17.1.1 NAME 'authorizedServiceObject' objectclass ( 1.3.6.1.4.1.5322.17.1.1 NAME 'authorizedServiceObject'
DESC 'Auxiliary object class for adding authorizedService attribute' DESC 'Auxiliary object class for adding authorizedService attribute'
SUP top SUP top
...@@ -22,3 +30,9 @@ objectclass ( 1.3.6.1.4.1.5322.17.1.2 NAME 'hostObject' ...@@ -22,3 +30,9 @@ objectclass ( 1.3.6.1.4.1.5322.17.1.2 NAME 'hostObject'
SUP top SUP top
AUXILIARY AUXILIARY
MAY host ) MAY host )
objectclass ( 1.3.6.1.4.1.5322.17.1.3 NAME 'loginStatusObject'
DESC 'Auxiliary object class for login status attribute'
SUP top
AUXILIARY
MAY loginStatus )
...@@ -21,16 +21,6 @@ ...@@ -21,16 +21,6 @@
static int ppolicy_cid; static int ppolicy_cid;
static AttributeDescription *ad_loginStatus; static AttributeDescription *ad_loginStatus;
const char *at_loginStatus =
"( 1.3.6.1.4.1.4745.1.20.1 "
"NAME ( 'loginStatus' ) "
"DESC 'Currently logged in sessions for a user' "
"EQUALITY caseIgnoreMatch "
"SUBSTR caseIgnoreSubstringsMatch "
"ORDERING caseIgnoreOrderingMatch "
"SYNTAX OMsDirectoryString "
"USAGE directoryOperation )";
struct paminfo { struct paminfo {
struct berval uid; struct berval uid;
struct berval dn; struct berval dn;
...@@ -667,7 +657,9 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op) ...@@ -667,7 +657,9 @@ int pam_pwmod(nssov_info *ni,TFILE *fp,Operation *op)
int nssov_pam_init() int nssov_pam_init()
{ {
int code = 0; int code = 0;
const char *text;
if (!ad_loginStatus) if (!ad_loginStatus)
code = register_at( at_loginStatus, &ad_loginStatus, 0 ); code = slap_str2ad( "loginStatus", &ad_loginStatus, &text );
return code; return code;
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment