diff options
author | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2008-12-28 17:17:41 +0100 |
---|---|---|
committer | Johannes Hofmann <Johannes.Hofmann@gmx.de> | 2008-12-28 17:17:41 +0100 |
commit | 0f8ac3432252390dc46b600409ba6fc88e958e95 (patch) | |
tree | bb66505421eb0cc1e9201586d027200fdb89213c /src/auth.c | |
parent | 7149a1e3fc877a8c060cbf07e4325d636cc807ad (diff) | |
parent | 5486bedf18450ae4de413c4174a0175948c95c3e (diff) |
merge with main
Diffstat (limited to 'src/auth.c')
-rw-r--r-- | src/auth.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -295,21 +295,20 @@ static AuthRealm_t *Auth_realm_by_path(const AuthHost_t *host, int i, j; int match_length; + match_length = 0; realm_best = NULL; for (i = 0; (realm = dList_nth_data(host->realms, i)); i++) { char *realm_path; for (j = 0; (realm_path = dList_nth_data(realm->paths, j)); j++) { - int realm_path_length; - - realm_path_length = strlen(realm_path); + int realm_path_length = strlen(realm_path); if (Auth_path_is_inside(path, realm_path, realm_path_length) && !(realm_best && match_length >= realm_path_length)) { realm_best = realm; match_length = realm_path_length; } - } /* for (j = 0; (path = ... */ - } /* for (i = 0; (realm = ... */ + } + } return realm_best; } @@ -353,7 +352,7 @@ static void Auth_realm_add_path(AuthRealm_t *realm, const char *path) /* * Return the authorization header for an HTTP query. */ -char *a_Auth_get_auth_str(const DilloUrl *url) +const char *a_Auth_get_auth_str(const DilloUrl *url) { AuthHost_t *host; AuthRealm_t *realm; |