Commit 24d33378 authored by Josh Wisenbaker's avatar Josh Wisenbaker

Merge branch '89-add-nomad-lastuser-key-with-keychainadd-mech' into 'CuteCabbage'

Resolve "Add NoMAD LastUser Key With KeychainAdd Mech"

See merge request !54
parents 5382ff3f b07ca584
Pipeline #27675290 passed with stage
in 1 minute and 50 seconds
This diff is collapsed.
...@@ -202,23 +202,21 @@ class NoLoMechanism: NSObject { ...@@ -202,23 +202,21 @@ class NoLoMechanism: NSObject {
//MARK: - Mechanism Verdicts //MARK: - Mechanism Verdicts
// Allow the login. End of the mechanism // Allow the login. End of the mechanism
func allowLogin() -> OSStatus { func allowLogin() {
os_log("Allowing login", log: noLoMechlog, type: .default) os_log("Allowing login", log: noLoMechlog, type: .default)
let error = mechCallbacks.SetResult(mechEngine, .allow) let error = mechCallbacks.SetResult(mechEngine, .allow)
if error != noErr { if error != noErr {
logOSStatusErr(error, sender: "allowLogin") logOSStatusErr(error, sender: "allowLogin")
} }
return error
} }
// disallow login // disallow login
func denyLogin() -> OSStatus { func denyLogin() {
os_log("Denying login", log: noLoMechlog, type: .default) os_log("Denying login", log: noLoMechlog, type: .default)
let error = mechCallbacks.SetResult(mechEngine, .deny) let error = mechCallbacks.SetResult(mechEngine, .deny)
if error != noErr { if error != noErr {
logOSStatusErr(error, sender: "denyLogin") logOSStatusErr(error, sender: "denyLogin")
} }
return error
} }
/// A simple method to send an OSStatus Error to the os.log error log with the name of the calling function. /// A simple method to send an OSStatus Error to the os.log error log with the name of the calling function.
......
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>BNDL</string> <string>BNDL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.0</string> <string>1.2.0-Beta</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>296</string> <string>298</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>
<string>Copyright © 2018 Orchard &amp; Grove. All rights reserved.</string> <string>Copyright © 2018 Orchard &amp; Grove. All rights reserved.</string>
<key>NSPrincipalClass</key> <key>NSPrincipalClass</key>
......
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