shortcut-params-20040804

Fix the retrieval of the shortcut params from the registry when the
HKCU\Software\Openafs\Client key exists but the AfscredsShortcutParams
is missing.

diff --git a/src/WINNT/client_creds/shortcut.cpp b/src/WINNT/client_creds/shortcut.cpp
index 6bce0c72b0707b40c1f6d7c991f2d1c3d1035182..da0f392622c4a1854852720976f640f2a4727b3e 100644 (file)
--- a/src/WINNT/client_creds/shortcut.cpp
+++ b/src/WINNT/client_creds/shortcut.cpp
@@ -115,9 +115,6 @@ void Shortcut_FixStartup (LPCTSTR pszLinkName, BOOL fAutoStart)
 
        code = RegOpenKeyEx(HKEY_CURRENT_USER, REGSTR_PATH_OPENAFS_CLIENT,
                             0, KEY_QUERY_VALUE, &hk);
-       if (code != ERROR_SUCCESS)
-           code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_OPENAFS_CLIENT,
-                                0, KEY_QUERY_VALUE, &hk);
        if (code == ERROR_SUCCESS) {
            len = sizeof(szParams);
            type = REG_SZ;
@@ -125,6 +122,17 @@ void Shortcut_FixStartup (LPCTSTR pszLinkName, BOOL fAutoStart)
                                    (BYTE *) &szParams, &len);
            RegCloseKey (hk);
        }
+       if (code != ERROR_SUCCESS) {
+           code = RegOpenKeyEx(HKEY_LOCAL_MACHINE, REGSTR_PATH_OPENAFS_CLIENT,
+                                0, KEY_QUERY_VALUE, &hk);
+           if (code == ERROR_SUCCESS) {
+               len = sizeof(szParams);
+               type = REG_SZ;
+               code = RegQueryValueEx(hk, "AfscredsShortcutParams", NULL, &type,
+                                       (BYTE *) &szParams, &len);
+               RegCloseKey (hk);
+           }
+       }
        Shortcut_Create (szShortcut, szSource, "Autostart Authentication Agent", szParams);
    }
    else // (!g.fAutoStart)