auth-options.c (256281) | auth-options.c (258343) |
---|---|
1/* $OpenBSD: auth-options.c,v 1.59 2013/07/12 00:19:58 djm Exp $ */ | 1/* $OpenBSD: auth-options.c,v 1.61 2013/11/08 00:39:14 djm Exp $ */ |
2/* 3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * As far as I am concerned, the code I have written for this software 7 * can be used freely for any purpose. Any derived versions of this 8 * software must be clearly marked as such, and if the derived work is 9 * incompatible with the protocol description in the RFC file, it must be --- 224 unchanged lines hidden (view full) --- 234 file, linenum); 235 free(s); 236 goto bad_option; 237 } 238 s[i] = '\0'; 239 auth_debug_add("Adding to environment: %.900s", s); 240 debug("Adding to environment: %.900s", s); 241 opts++; | 2/* 3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * As far as I am concerned, the code I have written for this software 7 * can be used freely for any purpose. Any derived versions of this 8 * software must be clearly marked as such, and if the derived work is 9 * incompatible with the protocol description in the RFC file, it must be --- 224 unchanged lines hidden (view full) --- 234 file, linenum); 235 free(s); 236 goto bad_option; 237 } 238 s[i] = '\0'; 239 auth_debug_add("Adding to environment: %.900s", s); 240 debug("Adding to environment: %.900s", s); 241 opts++; |
242 new_envstring = xmalloc(sizeof(struct envstring)); | 242 new_envstring = xcalloc(1, sizeof(struct envstring)); |
243 new_envstring->s = s; 244 new_envstring->next = custom_environment; 245 custom_environment = new_envstring; 246 goto next_option; 247 } 248 cp = "from=\""; 249 if (strncasecmp(opts, cp, strlen(cp)) == 0) { 250 const char *remote_ip = get_remote_ipaddr(); --- 387 unchanged lines hidden --- | 243 new_envstring->s = s; 244 new_envstring->next = custom_environment; 245 custom_environment = new_envstring; 246 goto next_option; 247 } 248 cp = "from=\""; 249 if (strncasecmp(opts, cp, strlen(cp)) == 0) { 250 const char *remote_ip = get_remote_ipaddr(); --- 387 unchanged lines hidden --- |