From 278862f63decc361c2dcc1e99da541c431b7099d Mon Sep 17 00:00:00 2001 From: "tperfitt@twocanoes.com" Date: Thu, 4 Jan 2024 20:04:55 -0600 Subject: [PATCH] applied patch from Jim Zajkowski to fix integration issues --- xCreds.xcodeproj/project.pbxproj | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj index df78e0fe..f053596c 100644 --- a/xCreds.xcodeproj/project.pbxproj +++ b/xCreds.xcodeproj/project.pbxproj @@ -9,6 +9,8 @@ /* Begin PBXBuildFile section */ 089B22F12AFAED280006B6BC /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 089B22F02AFAED280006B6BC /* NetworkMonitor.swift */; }; 089B22F22AFAED810006B6BC /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 089B22F02AFAED280006B6BC /* NetworkMonitor.swift */; }; + 54848E8F2B47336D000DF420 /* KerbUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C4BABA2B353B4B007B2C57 /* KerbUtil.m */; }; + 54848E902B47336D000DF420 /* KerbUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 76C4BABA2B353B4B007B2C57 /* KerbUtil.m */; }; 760148A92B23639D00E119A2 /* NSBundle+FindBundlePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 760148A82B23639D00E119A2 /* NSBundle+FindBundlePath.swift */; }; 760148AA2B2365F100E119A2 /* NSBundle+FindBundlePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 760148A82B23639D00E119A2 /* NSBundle+FindBundlePath.swift */; }; 760418D22A1332210051411B /* SignInWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 760418CF2A1332210051411B /* SignInWindowController.swift */; }; @@ -71,8 +73,6 @@ 7657DEC92B350606003A23DB /* KlistUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7657DEC82B350606003A23DB /* KlistUtil.swift */; }; 7657DECC2B35061E003A23DB /* SiteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7657DECB2B35061E003A23DB /* SiteManager.swift */; }; 7657DECD2B35061E003A23DB /* SiteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7657DECB2B35061E003A23DB /* SiteManager.swift */; }; - 7657DED62B351A67003A23DB /* KerbUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 7657DED42B351A67003A23DB /* KerbUtil.m */; }; - 7657DED72B351A67003A23DB /* KerbUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 7657DED42B351A67003A23DB /* KerbUtil.m */; }; 7657DED92B351B5B003A23DB /* UNIXUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7657DED82B351B5B003A23DB /* UNIXUtilities.swift */; }; 7657DEDA2B351B5B003A23DB /* UNIXUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7657DED82B351B5B003A23DB /* UNIXUtilities.swift */; }; 7659CA07298E1BB6005D1AA3 /* DefaultBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 7659CA06298E1BB6005D1AA3 /* DefaultBackground.png */; }; @@ -378,7 +378,6 @@ 7657DECB2B35061E003A23DB /* SiteManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SiteManager.swift; sourceTree = ""; }; 7657DED22B350644003A23DB /* GSSItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GSSItem.h; sourceTree = ""; }; 7657DED32B35064E003A23DB /* krb5.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = krb5.h; sourceTree = ""; }; - 7657DED42B351A67003A23DB /* KerbUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = KerbUtil.m; path = "../NoMAD-ADAuth/NoMAD-ADAuth/KerbUtil.m"; sourceTree = ""; }; 7657DED52B351A67003A23DB /* KerbUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KerbUtil.h; sourceTree = ""; }; 7657DED82B351B5B003A23DB /* UNIXUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UNIXUtilities.swift; sourceTree = ""; }; 7659CA06298E1BB6005D1AA3 /* DefaultBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = DefaultBackground.png; sourceTree = ""; }; @@ -711,7 +710,6 @@ 76C4BAB92B353B3F007B2C57 /* NoMAD */ = { isa = PBXGroup; children = ( - 7657DED42B351A67003A23DB /* KerbUtil.m */, 7657DEAE2B3503BF003A23DB /* SessionManager.swift */, 7657DED82B351B5B003A23DB /* UNIXUtilities.swift */, 7657DED52B351A67003A23DB /* KerbUtil.h */, @@ -1173,6 +1171,7 @@ 7632E3A32873581100E37923 /* KeychainUtil.swift in Sources */, 76CCF5442B12E478003F85E9 /* SelectLocalAccountWindowController.swift in Sources */, 76B882AB29CCFD7A00BB8186 /* TCSKeychain.m in Sources */, + 54848E8F2B47336D000DF420 /* KerbUtil.m in Sources */, 76BEF7DD2871F5F00013E2A1 /* TCSReturnWindow.m in Sources */, 76EECCFB2873DFFB00483C66 /* PasswordUtils.swift in Sources */, 76DF50B62A1C5EFF007BC708 /* DefaultsOverride.swift in Sources */, @@ -1233,7 +1232,6 @@ 76EECD0528753C7F00483C66 /* String+Base64URLEncoded.swift in Sources */, 7657DECD2B35061E003A23DB /* SiteManager.swift in Sources */, 760148A92B23639D00E119A2 /* NSBundle+FindBundlePath.swift in Sources */, - 7657DED72B351A67003A23DB /* KerbUtil.m in Sources */, 76E74DD02B3902F0004C6429 /* XCredsMechanismProtocol.swift in Sources */, 766355DB287132E9002E3867 /* LoginWebViewController.swift in Sources */, 7657DEDA2B351B5B003A23DB /* UNIXUtilities.swift in Sources */, @@ -1293,7 +1291,6 @@ 767116A7284AABC500CCD6FF /* NotifyManager.swift in Sources */, 76EE06B827FD1EB7009E0F3A /* PreferencesWindowController.swift in Sources */, 76A8A4E32A0DF7C700AA6054 /* NSTaskWrapper.swift in Sources */, - 7657DED62B351A67003A23DB /* KerbUtil.m in Sources */, 76EE06AE27FD1DC3009E0F3A /* PrefKeys.swift in Sources */, 764D8131284D11EE00B3EE54 /* MenuItems.swift in Sources */, 767116B3284B045800CCD6FF /* KeychainUtil.swift in Sources */, @@ -1306,6 +1303,7 @@ 76319373287E18BF00D36BF7 /* DataExtension.swift in Sources */, 76E74DD12B390327004C6429 /* ContextAndHintHandling.swift in Sources */, 76EECD002875135900483C66 /* LoggerHelper.swift in Sources */, + 54848E902B47336D000DF420 /* KerbUtil.m in Sources */, 76873E2F2A107736001418A9 /* DefaultsHelper.swift in Sources */, 76D175772B23C62A00E64A62 /* UpdatePasswordWindowController.swift in Sources */, 7683973129A854EC003D9B9F /* NSImage+String.swift in Sources */, @@ -1943,7 +1941,7 @@ isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/twocanoes/OIDCLite"; requirement = { - branch = main; + branch = ropg; kind = branch; }; };