← Back to branch summary

~ubuntu-branches/ubuntu/saucy/evolution-data-server/saucy

« back to all changes in this revision

Viewing changes to camel/camel.c

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-10-08 12:58:16 UTC
  • mfrom: (181.1.7 quantal)
  • Revision ID: package-import@ubuntu.com-20121008125816-i3n76e8c0m64e7xp
Tags: 3.6.0-0ubuntu2
https://launchpad.net/bugs/1038047
https://launchpad.net/bugs/1038047
* Fix LP: #1038047 part 1 - Don't abort in e_source_registry_new* when a
  problem occurs connecting to the Dbus service
  - add debian/patches/dont-abort-in-e_source_registry_new.patch
  - update debian/patches/series
* Fix LP: #1038047 part 2 - libedataserver depends on
  evolution-data-server-common to ensure that the GSettings schemas are
  present
  - update debian/control

Show diffs side-by-side

added added

removed removed

Lines of Context:
camel/camel.c
65
65
        FILE *f;
66
66
        gchar buf[80];
67
67
 
68
 
        f = fopen(NSS_SYSTEM_DB "/pkcs11.txt", "r");
 
68
        f = fopen (NSS_SYSTEM_DB "/pkcs11.txt", "r");
69
69
        if (!f)
70
70
                return FALSE;
71
71
 
72
72
        /* Check whether the system NSS db is actually enabled */
73
73
        while (fgets (buf, 80, f) && !found) {
74
 
                if (!strcmp(buf, "library=libnsssysinit.so\n"))
 
74
                if (!strcmp (buf, "library=libnsssysinit.so\n"))
75
75
                        found = TRUE;
76
76
        }
77
77
        fclose (f);
127
127
                         * to prevent camel from bailing out on first run. */
128
128
#ifdef G_OS_WIN32
129
129
                        g_mkdir_with_parents (configdir, 0700);
130
 
                        nss_sql_configdir = g_strconcat ("sql:", nss_configdir, NULL);
 
130
                        nss_sql_configdir = g_strconcat (
 
131
                                "sql:", nss_configdir, NULL);
131
132
#else
132
 
                        gchar *user_nss_dir = g_build_filename ( g_get_home_dir (),
133
 
                                                                 ".pki/nssdb", NULL );
 
133
                        gchar *user_nss_dir = g_build_filename (
 
134
                                 g_get_home_dir (), ".pki/nssdb", NULL );
134
135
                        if (g_mkdir_with_parents (user_nss_dir, 0700))
135
 
                                g_warning("Failed to create SQL database directory %s: %s\n",
136
 
                                          user_nss_dir, strerror (errno));
 
136
                                g_warning (
 
137
                                        "Failed to create SQL "
 
138
                                        "database directory %s: %s\n",
 
139
                                        user_nss_dir, strerror (errno));
137
140
 
138
 
                        nss_sql_configdir = g_strconcat ("sql:", user_nss_dir, NULL);
 
141
                        nss_sql_configdir = g_strconcat (
 
142
                                "sql:", user_nss_dir, NULL);
139
143
                        g_free (user_nss_dir);
140
144
#endif
141
145
                }
155
159
                        0);                     /* flags */
156
160
 
157
161
                if (status == SECFailure) {
158
 
                        g_warning ("Failed to initialize NSS SQL database in %s: NSS error %d",
159
 
                                   nss_sql_configdir, PORT_GetError ());
 
162
                        g_warning (
 
163
                                "Failed to initialize NSS SQL database in %s: NSS error %d",
 
164
                                nss_sql_configdir, PORT_GetError ());
160
165
                        /* Fall back to opening the old DBM database */
161
166
                }
162
167
#endif