]> granicus.if.org Git - fcron/commitdiff
Merge branch 'fcron-3.0'
authorthib <thib@berseker.(none)>
Sat, 12 Mar 2011 12:46:31 +0000 (12:46 +0000)
committerthib <thib@berseker.(none)>
Sat, 12 Mar 2011 12:46:31 +0000 (12:46 +0000)
Conflicts:
.gitignore
doc/en/changes.sgml

1  2 
.gitignore
Makefile.in
doc/en/changes.sgml
doc/en/fcrontab.5.sgml
fcrontab.c
fileconf.c

diff --cc .gitignore
index 4c083a77c2acbfc297dc517e05e8d0bf2feb57c6,d1570b47c1c7a39b8e23f253d15d54933905751c..93a7e3ab652d1d048a557445e57ec9fd997183bd
@@@ -14,9 -14,9 +14,11 @@@ fcronsighu
  files/fcron.conf
  convert-fcrontab
  doc/stylesheets/fcron-doc.dsl
- PREVIOUS_VERSION
 +doc/fcron-doc.mod
 +exe_list_test
+ MANIFEST
+ VERSION
+ PREVIOUS_VERSION
  doc/en/HTML/*
  doc/en/man/*
  doc/en/txt/*
diff --cc Makefile.in
Simple merge
index 2e59c2336b5b2e8066d177d8f336a6225ad087cc,9ee6b3ed3be1874f7b1cb1ae2c6f548801e8d0fb..e458764deaa58b3a3f7218db9d69a1c8b0802e3e
@@@ -13,15 -13,24 +13,33 @@@ A copy of the license is included in gf
     <sect1 id="changes">
        <title>Changes</title>
  
-        <title>From version 3.0.5 to 3.1.0</title>
 +      <itemizedlist>
++       <title>From version 3.0.6 to 3.1.0</title>
 +       <listitem>
 +          <para>Pass fcrondyn client credentials through the socket when possible so as the user doesn't need to type his password when using fcrondyn.</para>
 +         </listitem>
 +       <listitem>
 +          <para>Code clean-up: Implemented generic unordred list for lavgq / exeq.</para>
 +         </listitem>
 +      </itemizedlist>
+       <itemizedlist>
+        <title>From version 3.0.5 to 3.0.6</title>
+        <listitem>
+           <para>Fixed bug preventing normal user from running fcrontab -l if fcron's uid!=gid</para>
+        </listitem>
+        <listitem>
+           <para>Fixed fcrontab's PAM initialization when working on the systab user.</para>
+        </listitem>
+        <listitem>
+           <para>Added check_system_crontabs.sh which is to replace the less portable check_system_crontabs.bash.</para>
+        </listitem>
+        <listitem>
+           <para>Added option -c to check_system_crontabs.sh to specify a fcron.conf file to use</para>
+        </listitem>
+        <listitem>
+           <para>Fixed Makefile bug preventing installation when building from a different folder than the sources (wrong fcron.conf path)</para>
+        </listitem>
+       </itemizedlist>
  
        <itemizedlist>
         <title>From version 3.0.4 to 3.0.5</title>
Simple merge
diff --cc fcrontab.c
Simple merge
diff --cc fileconf.c
Simple merge