Security-59754.80.3.tar.gz

[apple/security.git] / securityd / src / credential.cpp

diff --git a/securityd/src/credential.cpp b/securityd/src/credential.cpp
index 8d14bc6c151b613c996e418d36cb35c8a849a8f9..3da55c7f272835dad134f5877e6764bead8bce7c 100644 (file)
--- a/securityd/src/credential.cpp
+++ b/securityd/src/credential.cpp
@@ -61,7 +61,7 @@ CredentialImpl::CredentialImpl(const string &username, const string &password, b
         int checkpw_status = checkpw_internal(pw, passwd);
 
         if (checkpw_status != CHECKPW_SUCCESS) {
         int checkpw_status = checkpw_internal(pw, passwd);
 
         if (checkpw_status != CHECKPW_SUCCESS) {

-            syslog(LOG_ERR, "checkpw() returned %d; failed to authenticate user %s (uid %lu).", checkpw_status, pw->pw_name, pw->pw_uid);
+            syslog(LOG_ERR, "checkpw() returned %d; failed to authenticate user %s (uid %u).", checkpw_status, pw->pw_name, pw->pw_uid);

             break;
         }
 
             break;
         }
 


@@ -132,10 +132,11 @@ CredentialImpl::merge(const CredentialImpl &other)
 {
     // try to ensure that the credentials are the same type
     assert(mRight == other.mRight);
 {
     // try to ensure that the credentials are the same type
     assert(mRight == other.mRight);

-    if (mRight)
+    if (mRight) {

         assert(mName == other.mName);
         assert(mName == other.mName);

-    else 
+    } else {

         assert(mUid == other.mUid);
         assert(mUid == other.mUid);

+    }

 
     if (other.mValid && (!mValid || mCreationTime < other.mCreationTime))
     {
 
     if (other.mValid && (!mValid || mCreationTime < other.mCreationTime))
     {