projects
/
mmh
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mhsign: Fix key lookup of aliases when encrypting
[mmh]
/
uip
/
aliasbr.c
diff --git
a/uip/aliasbr.c
b/uip/aliasbr.c
index
1ed527f
..
b00f51b
100644
(file)
--- a/
uip/aliasbr.c
+++ b/
uip/aliasbr.c
@@
-76,7
+76,7
@@
akresult(struct aka *ak)
for (ad = ak->ak_addr; ad; ad = ad->ad_next) {
pp = ad->ad_local ? akval(ak->ak_next, ad->ad_text)
for (ad = ak->ak_addr; ad; ad = ad->ad_next) {
pp = ad->ad_local ? akval(ak->ak_next, ad->ad_text)
- : getcpy(ad->ad_text);
+ : mh_xstrdup(ad->ad_text);
if (cp) {
dp = cp;
if (cp) {
dp = cp;
@@
-103,7
+103,7
@@
akval(struct aka *ak, char *s)
if (aleq(s, ak->ak_name))
return akresult(ak);
if (aleq(s, ak->ak_name))
return akresult(ak);
- return getcpy(s);
+ return mh_xstrdup(s);
}
}
@@
-432,7
+432,7
@@
add_aka(struct aka *ak, char *pp)
return;
ad = mh_xcalloc(1, sizeof(*ad));
return;
ad = mh_xcalloc(1, sizeof(*ad));
- ad->ad_text = getcpy(pp);
+ ad->ad_text = mh_xstrdup(pp);
ad->ad_local = strchr(pp, '@') == NULL;
ad->ad_next = NULL;
if (ak->ak_addr)
ad->ad_local = strchr(pp, '@') == NULL;
ad->ad_next = NULL;
if (ak->ak_addr)
@@
-470,7
+470,7
@@
akalloc(char *id)
p = mh_xcalloc(1, sizeof(*p));
p = mh_xcalloc(1, sizeof(*p));
- p->ak_name = getcpy(id);
+ p->ak_name = mh_xstrdup(id);
p->ak_visible = 0;
p->ak_addr = NULL;
p->ak_next = NULL;
p->ak_visible = 0;
p->ak_addr = NULL;
p->ak_next = NULL;
@@
-491,11
+491,11
@@
hmalloc(struct passwd *pw)
p = mh_xcalloc(1, sizeof(*p));
p = mh_xcalloc(1, sizeof(*p));
- p->h_name = getcpy(pw->pw_name);
+ p->h_name = mh_xstrdup(pw->pw_name);
p->h_uid = pw->pw_uid;
p->h_gid = pw->pw_gid;
p->h_uid = pw->pw_uid;
p->h_gid = pw->pw_gid;
- p->h_home = getcpy(pw->pw_dir);
- p->h_shell = getcpy(pw->pw_shell);
+ p->h_home = mh_xstrdup(pw->pw_dir);
+ p->h_shell = mh_xstrdup(pw->pw_shell);
p->h_ngrps = 0;
p->h_next = NULL;
/* append to end */
p->h_ngrps = 0;
p->h_next = NULL;
/* append to end */