Merge branch 'master' of ssh://git.crans.org/git/ldap
This commit is contained in:
commit
be6b378bf8
3 changed files with 22 additions and 3 deletions
|
@ -10,6 +10,7 @@
|
|||
# Valentin Samir <samir@crans.org>
|
||||
# Daniel Stan <dstan@crans.org>
|
||||
# Vincent Le Gallic <legallic@crans.org>
|
||||
# Pierre-Elliott Bécue <becue@crans.org>
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions are met:
|
||||
|
@ -627,7 +628,7 @@ class machine(CransLdapObject):
|
|||
ufields = ['mid', 'macAddress', 'host', 'midType']
|
||||
ofields = []
|
||||
mfields = ['info', 'blacklist', 'hostAlias', 'exempt',
|
||||
'portTCPout', 'portTCPin', 'portUDPout', 'portUDPin']
|
||||
'portTCPout', 'portTCPin', 'portUDPout', 'portUDPin','sshFingerprint']
|
||||
xfields = ['ipHostNumber']
|
||||
|
||||
def __init__(self, conn, dn, mode='ro', ldif = None):
|
||||
|
@ -662,7 +663,7 @@ class adherent(proprio):
|
|||
ofields = proprio.ofields + ['charteMA',
|
||||
'canonicalAlias', 'solde', 'contourneGreylist',
|
||||
'rewriteMailHeaders', 'derniereConnexion',
|
||||
'homepageAlias']
|
||||
'homepageAlias','gpgFingerprint']
|
||||
mfields = proprio.mfields + ['carteEtudiant', 'mailAlias', 'droits' ]
|
||||
xfields = ['etudes', 'postalAddress']
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue