← Back to branch summary

~ubuntu-branches/ubuntu/natty/exim4/natty-security

« back to all changes in this revision

Viewing changes to src/lookups/passwd.c

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-02-09 21:31:35 UTC
  • mfrom: (2.3.6 experimental)
  • Revision ID: james.westby@ubuntu.com-20110209213135-rh0yfiscmh16rata
Tags: 4.74-1ubuntu1
https://launchpad.net/bugs/713855
http://bugs.debian.org/528625
http://bugs.debian.org/542726
https://launchpad.net/bugs/708023
* Merge from debian experimental.  Remaining changes: (LP: #713855)
  - debian/patches/71_exiq_grep_error_on_messages_without_size.patch:
    + Improve handling of broken messages when "exim4 -bp" (mailq)
      reports lines without size info. (Closes: #528625)
  - debian/control: Don't declare a Provides: default-mta; in Ubuntu,
    we want postfix to be the default.
  - debian/{control,rules}: Add and enable hardened build for PIE.
    (Closes: #542726)
* Update 71_exiq_grep_error_on_messages_without_size.patch to get way
  which upstream has fixed it. Probably it can be dropped with next
  upstream release.
* This upload fixes CVE: (LP: #708023)
  - CVE-2011-0017

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lookups/passwd.c
8
8
/* See the file NOTICE for conditions of use and distribution. */
9
9
 
10
10
#include "../exim.h"
11
 
#include "passwd.h"
12
11
 
13
12
 
14
13
 
18
17
 
19
18
/* See local README for interface description */
20
19
 
21
 
void *
 
20
static void *
22
21
passwd_open(uschar *filename, uschar **errmsg)
23
22
{
24
23
filename = filename;     /* Keep picky compilers happy */
35
34
 
36
35
/* See local README for interface description */
37
36
 
38
 
int
 
37
static int
39
38
passwd_find(void *handle, uschar *filename, uschar *keystring, int length,
40
39
  uschar **result, uschar **errmsg, BOOL *do_cache)
41
40
{
53
52
return OK;
54
53
}
55
54
 
 
55
 
 
56
 
 
57
/*************************************************
 
58
*         Version reporting entry point          *
 
59
*************************************************/
 
60
 
 
61
/* See local README for interface description. */
 
62
 
 
63
#include "../version.h"
 
64
 
 
65
void
 
66
passwd_version_report(FILE *f)
 
67
{
 
68
#ifdef DYNLOOKUP
 
69
fprintf(f, "Library version: passwd: Exim version %s\n", EXIM_VERSION_STR);
 
70
#endif
 
71
}
 
72
 
 
73
static lookup_info _lookup_info = {
 
74
  US"passwd",                    /* lookup name */
 
75
  lookup_querystyle,             /* query-style lookup */
 
76
  passwd_open,                   /* open function */
 
77
  NULL,                          /* no check function */
 
78
  passwd_find,                   /* find function */
 
79
  NULL,                          /* no close function */
 
80
  NULL,                          /* no tidy function */
 
81
  NULL,                          /* no quoting function */
 
82
  passwd_version_report          /* version reporting */
 
83
};
 
84
 
 
85
#ifdef DYNLOOKUP
 
86
#define passwd_lookup_module_info _lookup_module_info
 
87
#endif
 
88
 
 
89
static lookup_info *_lookup_list[] = { &_lookup_info };
 
90
lookup_module_info passwd_lookup_module_info = { LOOKUP_MODULE_INFO_MAGIC, _lookup_list, 1 };
 
91
 
56
92
/* End of lookups/passwd.c */