Deleted Added
sdiff udiff text old ( 57416 ) new ( 57422 )
full compact
expand_hostname.c (57416) expand_hostname.c (57422)
1/*
2 * Copyright (c) 1999 - 2000 Kungliga Tekniska H�gskolan
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 19 unchanged lines hidden (view full) ---

28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "krb5_locl.h"
35
1/*
2 * Copyright (c) 1999 - 2000 Kungliga Tekniska H�gskolan
3 * (Royal Institute of Technology, Stockholm, Sweden).
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

--- 19 unchanged lines hidden (view full) ---

28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "krb5_locl.h"
35
36RCSID("$Id: expand_hostname.c,v 1.7 2000/02/02 04:42:57 assar Exp $");
36RCSID("$Id: expand_hostname.c,v 1.8 2000/02/20 02:25:29 assar Exp $");
37
38static krb5_error_code
39copy_hostname(krb5_context context,
40 const char *orig_hostname,
41 char **new_hostname)
42{
43 *new_hostname = strdup (orig_hostname);
44 if (*new_hostname == NULL)

--- 31 unchanged lines hidden (view full) ---

76 return 0;
77 }
78 }
79 freeaddrinfo (ai);
80 return copy_hostname (context, orig_hostname, new_hostname);
81}
82
83/*
37
38static krb5_error_code
39copy_hostname(krb5_context context,
40 const char *orig_hostname,
41 char **new_hostname)
42{
43 *new_hostname = strdup (orig_hostname);
44 if (*new_hostname == NULL)

--- 31 unchanged lines hidden (view full) ---

76 return 0;
77 }
78 }
79 freeaddrinfo (ai);
80 return copy_hostname (context, orig_hostname, new_hostname);
81}
82
83/*
84 * handle the case of the hostname being unresolvable and thus identical
85 */
86
87static krb5_error_code
88vanilla_hostname (krb5_context context,
89 const char *orig_hostname,
90 char **new_hostname,
91 char ***realms)
92{
93 krb5_error_code ret;
94
95 ret = copy_hostname (context, orig_hostname, new_hostname);
96 if (ret)
97 return ret;
98 strlwr (*new_hostname);
99
100 ret = krb5_get_host_realm (context, *new_hostname, realms);
101 if (ret) {
102 free (*new_hostname);
103 return ret;
104 }
105 return 0;
106}
107
108/*
84 * expand `hostname' to a name we believe to be a hostname in newly
85 * allocated space in `host' and return realms in `realms'.
86 */
87
88krb5_error_code
89krb5_expand_hostname_realms (krb5_context context,
90 const char *orig_hostname,
91 char **new_hostname,
92 char ***realms)
93{
94 struct addrinfo *ai, *a, hints;
95 int error;
96 krb5_error_code ret = 0;
97
98 memset (&hints, 0, sizeof(hints));
99 hints.ai_flags = AI_CANONNAME;
100
101 error = getaddrinfo (orig_hostname, NULL, &hints, &ai);
102 if (error)
109 * expand `hostname' to a name we believe to be a hostname in newly
110 * allocated space in `host' and return realms in `realms'.
111 */
112
113krb5_error_code
114krb5_expand_hostname_realms (krb5_context context,
115 const char *orig_hostname,
116 char **new_hostname,
117 char ***realms)
118{
119 struct addrinfo *ai, *a, hints;
120 int error;
121 krb5_error_code ret = 0;
122
123 memset (&hints, 0, sizeof(hints));
124 hints.ai_flags = AI_CANONNAME;
125
126 error = getaddrinfo (orig_hostname, NULL, &hints, &ai);
127 if (error)
103 return copy_hostname (context, orig_hostname, new_hostname);
128 return vanilla_hostname (context, orig_hostname, new_hostname,
129 realms);
130
104 for (a = ai; a != NULL; a = a->ai_next) {
105 if (a->ai_canonname != NULL) {
106 ret = copy_hostname (context, orig_hostname, new_hostname);
131 for (a = ai; a != NULL; a = a->ai_next) {
132 if (a->ai_canonname != NULL) {
133 ret = copy_hostname (context, orig_hostname, new_hostname);
107 if (ret)
108 goto out;
134 if (ret) {
135 freeaddrinfo (ai);
136 return ret;
137 }
109 strlwr (*new_hostname);
110 ret = krb5_get_host_realm (context, *new_hostname, realms);
138 strlwr (*new_hostname);
139 ret = krb5_get_host_realm (context, *new_hostname, realms);
111 if (ret == 0)
112 goto out;
140 if (ret == 0) {
141 freeaddrinfo (ai);
142 return 0;
143 }
113 free (*new_hostname);
114 }
115 }
144 free (*new_hostname);
145 }
146 }
116 ret = copy_hostname (context, orig_hostname, new_hostname);
117 out:
118 freeaddrinfo (ai);
119 return ret;
147 return vanilla_hostname (context, orig_hostname, new_hostname, realms);
120}
148}