diff options
| -rw-r--r-- | source3/lib/util.c | 9 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_prs.c | 26 |
2 files changed, 2 insertions, 33 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c index 6b97491039..677871e2d0 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -1356,12 +1356,8 @@ char *automount_lookup(const char *user_name) } else { if ((nis_error = yp_match(nis_domain, nis_map, user_name, strlen(user_name), &nis_result, &nis_result_len)) == 0) { - if (!nis_error && nis_result_len >= sizeof(pstring)) { - nis_result_len = sizeof(pstring)-1; - } fstrcpy(last_key, user_name); - strncpy(last_value, nis_result, nis_result_len); - last_value[nis_result_len] = '\0'; + pstrcpy(last_value, nis_result); strip_mount_options(&last_value); } else if(nis_error == YPERR_KEY) { @@ -1682,8 +1678,7 @@ BOOL is_in_path(const char *name, name_compare_entry *namelist, BOOL case_sensit /* Get the last component of the unix name. */ p = strrchr_m(name, '/'); - strncpy(last_component, p ? ++p : name, sizeof(last_component)-1); - last_component[sizeof(last_component)-1] = '\0'; + pstrcpy(last_component, p ? ++p : name); for(; namelist->name != NULL; namelist++) { if(namelist->is_wild) { diff --git a/source3/rpc_parse/parse_prs.c b/source3/rpc_parse/parse_prs.c index 3742ac95be..77f0e6d5c8 100644 --- a/source3/rpc_parse/parse_prs.c +++ b/source3/rpc_parse/parse_prs.c @@ -1274,32 +1274,6 @@ BOOL prs_string(const char *name, prs_struct *ps, int depth, char *str, int max_ return True; } -BOOL prs_string_alloc(const char *name, prs_struct *ps, int depth, - const char **str) -{ - size_t len; - char *tmp_str; - - if (UNMARSHALLING(ps)) - len = strlen(&ps->data_p[ps->data_offset]); - else - len = strlen(*str); - - tmp_str = PRS_ALLOC_MEM(ps, char, len+1); - - if (tmp_str == NULL) - return False; - - if (MARSHALLING(ps)) - strncpy(tmp_str, *str, len); - - if (!prs_string(name, ps, depth, tmp_str, len+1)) - return False; - - *str = tmp_str; - return True; -} - /******************************************************************* prs_uint16 wrapper. Call this and it sets up a pointer to where the uint16 should be stored, or gets the size if reading. |