Index: services/univention-samba/python/share_restrictions.py
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/univention-samba/python/share_restrictions.py	(revision e957f80a50d57d734b2a24a0769375179cf4e715)
+++ services/univention-samba/python/share_restrictions.py	(revision 8017c12d0b27f04564884ac11a9840ce292f4bb7)
@@ -300,7 +300,7 @@
 
 	# set share options to -> shares
 	def _set_options(self, value, share, option):
-		if match and share and options and value:
+		if share and option and value:
 			if option not in self._shares[share]:
 				self._shares[share][option] = set()
 
Index: services/univention-samba4/s4search-decode
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- services/univention-samba4/s4search-decode	(revision e957f80a50d57d734b2a24a0769375179cf4e715)
+++ services/univention-samba4/s4search-decode	(revision 8017c12d0b27f04564884ac11a9840ce292f4bb7)
@@ -166,20 +166,6 @@
 				traceback.print_exc()
 
 
-def decode_pwdLastSet(value):
-	print "# decoded (Note: timezone not converted to local time):"
-	if long(value) == -1:
-		print "# %s: Just set" % self.attrname
-	elif long(value) == 0:
-		print "# %s: Must change on next logon" % self.attrname
-	else:
-		try:
-			print "# pwdLastSet: %s" % decode_100nanosectimestamp(value)
-		except:
-			print "# traceback during decoding:"
-			traceback.print_exc()
-
-
 class decode_drsblob():
 
 	def __init__(self, blobtype):
@@ -203,7 +189,7 @@
 	'supplementalCredentials': decode_supplementalCredentials,
 	'unicodePwd': decode_unicodePwd,
 	'krb5Key': decode_krb5Key,
-	'pwdLastSet': decode_pwdLastSet,
+	'pwdLastSet': decode_lastDate("pwdLastSet"),
 	'accountExpires': decode_accountExpires,
 	'badPasswordTime': decode_lastDate('badPasswordTime'),
 	'lastLogoff': decode_lastDate('lastLogoff'),